ffmpeg: Fix merge mistakes
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 10:39:27 +0000 (11:39 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 10:39:27 +0000 (11:39 +0100)
commit44a1dc013841b54c754f6971905b95fa5aaaf82e
tree6bd84d92b4f7196a09fc4d71100c9c8c6b8b0174
parentbde3117e727fa2dacac7cc422dba6cff06ebe651
ffmpeg: Fix merge mistakes
ext/ffmpeg/gstffmpegdec.c
ext/libpostproc/gstpostproc.c
gst-libs/ext/libav