Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 22 Mar 2012 14:31:40 +0000 (15:31 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 22 Mar 2012 14:31:40 +0000 (15:31 +0100)
commitb0cc0cf55df435f40d66f740b4ffdf83249f8647
treeedcb22b522a4b5aceeec100393db5840da4a9cf2
parentd155f3028d6b76273e8a9b3e8ba4065001222f65
parentd417f99cd7d4b2b8de61bbe552ab14e69c436b77
Merge branch 'master' into 0.11

Conflicts:
gst-libs/ext/libav
ext/ffmpeg/gstffmpegcodecmap.c
ext/ffmpeg/gstffmpegdec.c
ext/ffmpeg/gstffmpegmux.c