Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 17 Nov 2011 16:32:42 +0000 (17:32 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 17 Nov 2011 16:32:42 +0000 (17:32 +0100)
commitbc6ed0bf97e60615b5ef5a86fed3cb48c70a0b4f
treeec064c97947078428c96c68ae67ab7caebe7de04
parent940de5b195943ad3a64df3bc590916fe59c89688
parentfefa1df8b9115404c94ec2aa2e9d1ff8ca79d34c
Merge branch 'master' into 0.11

Conflicts:
ext/celt/gstceltdec.c
ext/opus/gstopusdec.c
ext/opus/gstopusdec.h
ext/opus/gstopusenc.c
ext/opus/gstopusenc.h
ext/opus/gstopusparse.c
ext/celt/gstceltdec.c
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
gst/camerabin/gstcamerabin.c
gst/mpeg4videoparse/mpeg4videoparse.c
gst/mpegtsdemux/tsdemux.c