Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 4 Aug 2011 07:36:07 +0000 (09:36 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 4 Aug 2011 07:36:07 +0000 (09:36 +0200)
commit01b9b5002fb057604855dffc9faac4903df4b8d7
treee6fc518a8dadb3d755e4ee409becba0cd783fee8
parent2988a4ccb224f0be59e0b67ca84e88a01bcee8ec
parentcc9e4903138894963e52d52dfc22ffb23d763b9c
Merge branch 'master' into 0.11

Conflicts:
common
configure.ac
gst/colorspace/colorspace.c
gst/colorspace/colorspace.h
gst/colorspace/gstcolorspace.c
configure.ac
ext/directfb/dfbvideosink.c
gst/id3tag/id3tag.c
gst/mxf/mxfdemux.c
gst/sdi/gstsdidemux.c
sys/Makefile.am