Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 14 Jun 2012 10:41:34 +0000 (12:41 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 14 Jun 2012 13:42:06 +0000 (15:42 +0200)
commit4a58fd4be4444b8195c438ccc6445ced5c2e532d
tree634526fb20645bea4429aa4670a348e008096fb9
parenta3c7cd4643719f1eec1f885c6634e1f4dbdf8f71
parent9761a6501b518a554fc5e52de8e9acdc4f8ced9a
Merge remote-tracking branch 'origin/0.10'

Conflicts:
common
ext/ffmpeg/Makefile.am
ext/ffmpeg/gstffmpegcfg.c
ext/ffmpeg/gstffmpegcodecmap.c
ext/ffmpeg/gstffmpegcodecmap.h
ext/ffmpeg/gstffmpegdec.c
ext/ffmpeg/gstffmpegenc.c
ext/ffmpeg/gstffmpegenc.h
tests/check/Makefile.am

Porting of the new video elements to 0.11 still pending.
ext/ffmpeg/Makefile.am
ext/ffmpeg/gstffmpeg.c
ext/ffmpeg/gstffmpeg.h
ext/ffmpeg/gstffmpegcfg.c
ext/ffmpeg/gstffmpegcodecmap.c
ext/ffmpeg/gstffmpegcodecmap.h
ext/ffmpeg/gstffmpegdec.c
ext/ffmpeg/gstffmpegenc.c
ext/ffmpeg/gstffmpegenc.h