Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 3 Oct 2011 09:32:24 +0000 (11:32 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 3 Oct 2011 09:32:24 +0000 (11:32 +0200)
commitd4b2751c396ba1ec4a2292eb36563aa09ab15a07
treec72a2202ab56de247c7a5e4b7673ffe2215a5e9f
parentafb740b8975f64d54f6f92698eba7200601c4827
parentd4d5e350d073bab89faf6a781ba5ef9df45f19b8
Merge branch 'master' into 0.11
ext/ffmpeg/gstffmpegdec.c