Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 2 Jun 2011 15:03:21 +0000 (17:03 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 2 Jun 2011 15:03:21 +0000 (17:03 +0200)
commitc312409c835c30e19df23ed000e07cca3f1ee92d
tree17793a27a9590438d1c911fc3d8feaf5564c0cec
parentdad7da7ca61451b50ba815b93bccf33e00684fde
parent4a66ecdf2577c3f9e7cffb143f3907edea01e00f
Merge branch 'master' into 0.11
configure.ac
ext/ffmpeg/Makefile.am
ext/ffmpeg/gstffmpegcodecmap.c
ext/ffmpeg/gstffmpegdec.c