Merge remote-tracking branch 'origin/0.10'
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 20 Apr 2012 14:23:41 +0000 (16:23 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 20 Apr 2012 14:23:41 +0000 (16:23 +0200)
1  2 
ext/ffmpeg/gstffmpegdec.c

Simple merge