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)
Conflicts:
gst-libs/ext/libav

1  2 
ext/ffmpeg/gstffmpegcodecmap.c
ext/ffmpeg/gstffmpegdec.c
ext/ffmpeg/gstffmpegmux.c

Simple merge
Simple merge
Simple merge