Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 26 Nov 2011 13:34:10 +0000 (13:34 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 26 Nov 2011 13:34:10 +0000 (13:34 +0000)
commitbe0d6baac5960546ce7e3d812734481580078f9e
tree28afa7224232fbe31d8c6e4bb7c564bb0d5d977f
parenta806ae2edddb0dd3fb82fda6fd2078c5fa2acab1
parenta3bc43192477baf4a8a0510fd55a762a408955c0
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
ext/pulse/pulseaudiosink.c
ext/pulse/pulsesrc.c
gst/audioparsers/gstaacparse.c
gst/audioparsers/gstamrparse.c
gst/audioparsers/gstdcaparse.c
gst/audioparsers/gstflacparse.c
gst/effectv/gstradioac.c
gst/effectv/gstradioac.h
gst/effectv/gstripple.c

Some possible FIXMEs remaining in the audio parser getcaps functions.
21 files changed:
ext/pulse/pulseaudiosink.c
ext/pulse/pulsesrc.c
ext/pulse/pulsesrc.h
gst/audioparsers/gstaacparse.c
gst/audioparsers/gstac3parse.c
gst/audioparsers/gstamrparse.c
gst/audioparsers/gstdcaparse.c
gst/audioparsers/gstflacparse.c
gst/audioparsers/gstmpegaudioparse.c
gst/effectv/gstedge.c
gst/effectv/gstquark.c
gst/effectv/gstradioac.c
gst/effectv/gstripple.c
gst/effectv/gstshagadelic.c
gst/effectv/gststreak.c
gst/effectv/gstvertigo.c
gst/effectv/gstwarp.c
gst/flv/gstflvdemux.c
gst/isomp4/gstqtmuxmap.c
gst/multifile/gstmultifilesink.c
gst/wavparse/gstwavparse.c