Merge branch 'master' into 0.11
authorEdward Hervey <edward.hervey@collabora.co.uk>
Wed, 8 Jun 2011 16:04:38 +0000 (18:04 +0200)
committerEdward Hervey <edward.hervey@collabora.co.uk>
Wed, 8 Jun 2011 16:04:49 +0000 (18:04 +0200)
commitaaa07b3b4c812d6025f3c403e383635d43204bea
tree274eb162353f78e6d469f5c4cc23055f1345758f
parent4a130c6a6c5e93693b49fcc02df6842dfd7ebb50
parent8e2404b8dfe1ed6c4a23573ec01de85604487d3c
Merge branch 'master' into 0.11
ext/ffmpeg/gstffmpegdec.c