Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 29 Apr 2011 16:40:36 +0000 (18:40 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 29 Apr 2011 16:40:36 +0000 (18:40 +0200)
commitc71a2ec502633c6d0fb11bcb573c26facc355556
treed47259de305977fa3ed8b7f85c81ac2e866d617b
parent195f2afea64f33ab870836fc07a0e2756f371e14
parente94538ce1d2943536eaabb35903e2de3bce4b739
Merge branch 'master' into 0.11

Conflicts:
configure.ac
ext/ffmpeg/gstffmpegdec.c
configure.ac
ext/ffmpeg/gstffmpeg.c
ext/ffmpeg/gstffmpegaudioresample.c
ext/ffmpeg/gstffmpegcodecmap.c
ext/ffmpeg/gstffmpegdec.c
ext/ffmpeg/gstffmpegdeinterlace.c
ext/ffmpeg/gstffmpegdemux.c
ext/ffmpeg/gstffmpegenc.c
ext/ffmpeg/gstffmpegmux.c
ext/ffmpeg/gstffmpegprotocol.c
ext/libpostproc/gstpostproc.c