Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 12:03:33 +0000 (13:03 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 12:03:33 +0000 (13:03 +0100)
commit74de5954af9778c88fba2c2cc8e057d5b7f57efd
tree28e5f83c074b1f5e1021b1827c349c3a2436b1be
parent56a07a14b59bb891355c407457e327f94f337392
parent1651493ae0e20c91b3a46e950339fa1eb6d977ea
Merge branch 'master' into 0.11

Conflicts:
ext/a52dec/gsta52dec.c
configure.ac
ext/a52dec/gsta52dec.c
ext/amrnb/amrnbdec.c
ext/amrwbdec/amrwbdec.c
ext/dvdread/dvdreadsrc.c
ext/x264/gstx264enc.c