Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 10:35:55 +0000 (11:35 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 10:35:55 +0000 (11:35 +0100)
commitbde3117e727fa2dacac7cc422dba6cff06ebe651
tree9d1fdb2e45980ac9dcc0bd47d212544a55d69c5e
parentad53e32665ab1f6a34bfec7a54fbb0d1e1d5d4ac
parentb9ff7da938cbe4759bca08621c4c5ffc7599383b
Merge branch 'master' into 0.11

Conflicts:
configure.ac
ext/ffmpeg/gstffmpegcodecmap.c
ext/ffmpeg/gstffmpegdec.c
ext/ffmpeg/gstffmpegdeinterlace.c
ext/ffmpeg/gstffmpegmux.c
ext/libswscale/gstffmpegscale.c
ext/ffmpeg/gstffmpegaudioresample.c
ext/ffmpeg/gstffmpegdec.c
ext/ffmpeg/gstffmpegmux.c
ext/libpostproc/gstpostproc.c