Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 13:32:32 +0000 (14:32 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 13:32:32 +0000 (14:32 +0100)
commit93e3ed5a869afb79f9658f22ced4691ce475e8a1
treebaaec96daaf22857d61128401c12e2649ef25304
parent692e00cc00d772fe2b01f518cb9ac88d124807d1
parent2b2c0940f1b7ce8a858a26ad5e246fd645a83830
Merge branch 'master' into 0.11

Conflicts:
ext/cairo/gsttextoverlay.c
ext/pulse/pulseaudiosink.c
gst/audioparsers/gstaacparse.c
gst/avi/gstavimux.c
gst/flv/gstflvmux.c
gst/interleave/interleave.c
gst/isomp4/gstqtmux.c
gst/matroska/matroska-demux.c
gst/matroska/matroska-mux.c
gst/matroska/matroska-mux.h
gst/matroska/matroska-read-common.c
gst/multifile/gstmultifilesink.c
gst/multipart/multipartmux.c
gst/shapewipe/gstshapewipe.c
gst/smpte/gstsmpte.c
gst/udp/gstmultiudpsink.c
gst/videobox/gstvideobox.c
gst/videocrop/gstaspectratiocrop.c
gst/videomixer/videomixer.c
gst/videomixer/videomixer2.c
gst/wavparse/gstwavparse.c
po/ja.po
po/lv.po
po/sr.po
tests/check/Makefile.am
tests/check/elements/qtmux.c
tests/check/elements/rgvolume.c
68 files changed:
Makefile.am
configure.ac
ext/cairo/gsttextoverlay.c
ext/dv/gstdvdemux.c
ext/flac/gstflacdec.c
ext/gdk_pixbuf/gstgdkpixbufsink.c
ext/jack/gstjackaudiosink.c
ext/jack/gstjackaudiosink.h
ext/jack/gstjackaudiosrc.c
ext/jack/gstjackaudiosrc.h
ext/jpeg/gstjpegdec.c
ext/pulse/pulsesink.c
ext/soup/gstsouphttpclientsink.c
ext/wavpack/gstwavpackparse.c
gst/alpha/gstalpha.c
gst/alpha/gstalpha.h
gst/audiofx/audiochebband.c
gst/audiofx/audiocheblimit.c
gst/audiofx/audiofirfilter.c
gst/audiofx/audioiirfilter.c
gst/audiofx/audiowsincband.c
gst/audiofx/audiowsinclimit.c
gst/audioparsers/gstaacparse.c
gst/audioparsers/gstac3parse.c
gst/avi/gstavidemux.c
gst/avi/gstavimux.c
gst/equalizer/gstiirequalizer.c
gst/flv/gstflvdemux.c
gst/flv/gstflvmux.c
gst/imagefreeze/gstimagefreeze.c
gst/interleave/interleave.c
gst/isomp4/gstqtmoovrecover.c
gst/isomp4/gstqtmux.c
gst/isomp4/gstqtmux.h
gst/isomp4/qtdemux.c
gst/matroska/matroska-demux.c
gst/matroska/matroska-demux.h
gst/matroska/matroska-mux.c
gst/matroska/matroska-mux.h
gst/matroska/matroska-read-common.c
gst/multifile/gstmultifilesink.c
gst/multipart/multipartmux.c
gst/multipart/multipartmux.h
gst/rtpmanager/gstrtpbin.c
gst/rtpmanager/gstrtpjitterbuffer.c
gst/rtpmanager/gstrtpsession.c
gst/rtpmanager/gstrtpssrcdemux.c
gst/rtpmanager/rtpsession.c
gst/rtsp/gstrtspsrc.c
gst/smpte/gstsmpte.c
gst/udp/gstmultiudpsink.c
gst/udp/gstudpsrc.c
gst/videocrop/gstaspectratiocrop.c
gst/videomixer/videomixer2.c
gst/wavparse/gstwavparse.c
gst/wavparse/gstwavparse.h
sys/oss4/oss4-mixer.c
sys/v4l2/gstv4l2bufferpool.c
sys/v4l2/gstv4l2videooverlay.c
sys/waveform/gstwaveformsink.c
sys/ximage/gstximagesrc.c
tests/check/Makefile.am
tests/check/elements/qtmux.c
tests/check/elements/rgvolume.c
tests/check/elements/souphttpsrc.c
tests/icles/gdkpixbufsink-test.c
tests/icles/v4l2src-test.c
tests/icles/videocrop-test.c