Merge remote-tracking branch 'origin/master' into 0.11
authorEdward Hervey <edward.hervey@collabora.co.uk>
Mon, 17 Oct 2011 14:29:10 +0000 (16:29 +0200)
committerEdward Hervey <edward.hervey@collabora.co.uk>
Mon, 17 Oct 2011 14:29:10 +0000 (16:29 +0200)
1  2 
configure.ac
ext/ffmpeg/gstffmpegdec.c
ext/ffmpeg/gstffmpegutils.h

diff --cc configure.ac
Simple merge
Simple merge
Simple merge