Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 15 Jun 2011 14:06:36 +0000 (16:06 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 15 Jun 2011 14:06:36 +0000 (16:06 +0200)
commit3687fe05e4aa1604ed5573f11cecb8582b656f08
treee5d9973f871541134db56b09bad8fe04d0d7590e
parent1fe4e2ad2aad70bea005261ca19c276596ae027a
parent81b71b65ee028ffcfd98ccfec52602e463c91c0a
Merge branch 'master' into 0.11

Conflicts:
android/aacparse.mk
android/amrparse.mk
android/h264parse.mk
android/metadata.mk
android/qtmux.mk
android/sdpelem.mk
configure.ac
gst/qtmux/gstqtmux.c
win32/common/config.h