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)
commita2b7a672b8826d9fb75f0889741c05ca76ce085f
treeef634796155235ab30dced5bc687f90bb6e272d3
parent6acbe1894374a51954b6cebd31d74c515d23ea17
parenta6c4f3ed4ef8a2ebc4f184a796e8230838bd99a4
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
configure.ac
ext/directfb/dfbvideosink.c
ext/resindvd/rsnparsetter.c
gst/camerabin/camerabinimage.c
gst/camerabin/camerabinvideo.c
gst/fieldanalysis/gstfieldanalysis.c
gst/mpegtsdemux/tsdemux.c
gst/mxf/mxfmux.c
sys/Makefile.am
sys/qtwrapper/audiodecoders.c