Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 13 Jan 2012 00:11:54 +0000 (00:11 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 13 Jan 2012 00:11:54 +0000 (00:11 +0000)
13 files changed:
1  2 
ext/cog/gstcogmse.c
ext/modplug/gstmodplug.cc
ext/opus/gstopusparse.c
ext/schroedinger/gstschrodec.c
ext/schroedinger/gstschroenc.c
gst/dccp/gstdccpclientsink.c
gst/hls/gsthlsdemux.c
gst/inter/gstinteraudiosink.c
gst/inter/gstinteraudiosrc.c
gst/inter/gstintervideosink.c
gst/inter/gstintervideosrc.c
gst/patchdetect/gstpatchdetect.c
gst/y4m/gsty4mdec.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge