Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-ffmpeg
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 1 Jul 2009 09:21:46 +0000 (11:21 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 1 Jul 2009 09:21:46 +0000 (11:21 +0200)
1  2 
ext/ffmpeg/gstffmpegdec.c

Simple merge