Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 15:41:53 +0000 (17:41 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 15:41:53 +0000 (17:41 +0200)
commit860ccd414dbb313fabf065b92838f0f39037584b
tree0d5c0d3510db3ca3d7e6487420e8d09f74ae1961
parenta9ec4d62a89dd53aa295af02c7d5f57ef936359b
parentd84d98943af42ce645ee022207bcf04e747d2d4a
Merge remote-tracking branch 'origin/0.10'

Conflicts:
NEWS
RELEASE
common
configure.ac
docs/libs/gst-plugins-bad-libs-sections.txt
docs/plugins/gst-plugins-bad-plugins.args
docs/plugins/gst-plugins-bad-plugins.hierarchy
docs/plugins/gst-plugins-bad-plugins.interfaces
docs/plugins/inspect/plugin-adpcmdec.xml
docs/plugins/inspect/plugin-adpcmenc.xml
docs/plugins/inspect/plugin-assrender.xml
docs/plugins/inspect/plugin-audiovisualizers.xml
docs/plugins/inspect/plugin-autoconvert.xml
docs/plugins/inspect/plugin-bayer.xml
docs/plugins/inspect/plugin-bz2.xml
docs/plugins/inspect/plugin-camerabin2.xml
docs/plugins/inspect/plugin-celt.xml
docs/plugins/inspect/plugin-dataurisrc.xml
docs/plugins/inspect/plugin-debugutilsbad.xml
docs/plugins/inspect/plugin-dtmf.xml
docs/plugins/inspect/plugin-dtsdec.xml
docs/plugins/inspect/plugin-dvbsuboverlay.xml
docs/plugins/inspect/plugin-dvdspu.xml
docs/plugins/inspect/plugin-faac.xml
docs/plugins/inspect/plugin-faad.xml
docs/plugins/inspect/plugin-gsm.xml
docs/plugins/inspect/plugin-h264parse.xml
docs/plugins/inspect/plugin-mms.xml
docs/plugins/inspect/plugin-modplug.xml
docs/plugins/inspect/plugin-mpeg2enc.xml
docs/plugins/inspect/plugin-mpegdemux2.xml
docs/plugins/inspect/plugin-mpegtsdemux.xml
docs/plugins/inspect/plugin-mpegvideoparse.xml
docs/plugins/inspect/plugin-mplex.xml
docs/plugins/inspect/plugin-pcapparse.xml
docs/plugins/inspect/plugin-rawparse.xml
docs/plugins/inspect/plugin-rtpmux.xml
docs/plugins/inspect/plugin-rtpvp8.xml
docs/plugins/inspect/plugin-scaletempo.xml
docs/plugins/inspect/plugin-schro.xml
docs/plugins/inspect/plugin-sdp.xml
docs/plugins/inspect/plugin-segmentclip.xml
docs/plugins/inspect/plugin-shm.xml
docs/plugins/inspect/plugin-videomaxrate.xml
docs/plugins/inspect/plugin-videoparsersbad.xml
docs/plugins/inspect/plugin-vp8.xml
docs/plugins/inspect/plugin-y4mdec.xml
ext/celt/gstceltdec.c
ext/dts/gstdtsdec.c
ext/modplug/gstmodplug.cc
ext/opus/gstopusenc.c
gst-libs/gst/video/gstbasevideocodec.c
gst-libs/gst/video/gstbasevideocodec.h
gst-libs/gst/video/gstbasevideodecoder.c
gst-libs/gst/video/gstbasevideodecoder.h
gst-libs/gst/video/gstbasevideoencoder.c
gst-libs/gst/video/gstbasevideoencoder.h
gst/adpcmdec/Makefile.am
gst/audiovisualizers/gstbaseaudiovisualizer.c
gst/h264parse/gsth264parse.c
gst/mpegdemux/mpegtsparse.c
gst/mpegtsdemux/mpegtsbase.c
gst/mpegtsdemux/mpegtspacketizer.c
gst/mpegtsdemux/mpegtsparse.c
gst/mpegtsdemux/tsdemux.c
gst/mpegtsdemux/tsdemux.h
gst/mxf/mxfdemux.c
gst/rawparse/gstaudioparse.c
gst/videoparsers/gsth263parse.c
gst/videoparsers/gsth264parse.c
sys/d3dvideosink/d3dvideosink.c
sys/decklink/gstdecklinksink.cpp
sys/dvb/gstdvbsrc.c
sys/shm/gstshmsrc.c
sys/vdpau/h264/gstvdph264dec.c
sys/vdpau/mpeg/gstvdpmpegdec.c
tests/examples/opencv/gst_element_print_properties.c
win32/common/config.h
72 files changed:
configure.ac
ext/assrender/gstassrender.c
ext/celt/gstceltdec.c
ext/cog/gstcogcolorspace.c
ext/curl/gstcurlsink.c
ext/directfb/dfbvideosink.c
ext/dts/gstdtsdec.c
ext/dts/gstdtsdec.h
ext/faad/gstfaad.c
ext/flite/gstflitetestsrc.c
ext/gme/gstgme.c
ext/modplug/gstmodplug.cc
ext/musepack/gstmusepackdec.c
ext/openal/gstopenalsink.c
ext/opencv/gstfaceblur.c
ext/opencv/gstfacedetect.c
ext/opencv/gstopencvutils.c
ext/opencv/gstopencvvideofilter.c
ext/opus/gstopusenc.c
ext/resindvd/resindvdsrc.c
ext/rsvg/gstrsvgoverlay.c
ext/timidity/gstwildmidi.c
ext/vp8/gstvp8enc.c
gst-libs/gst/video/gstbasevideocodec.c
gst-libs/gst/video/gstbasevideocodec.h
gst-libs/gst/video/gstbasevideodecoder.c
gst-libs/gst/video/gstbasevideodecoder.h
gst-libs/gst/video/gstbasevideoencoder.c
gst-libs/gst/video/gstbasevideoencoder.h
gst/adpcmdec/Makefile.am
gst/aiff/aiffmux.c
gst/audiovisualizers/gstbaseaudiovisualizer.c
gst/camerabin2/gstwrappercamerabinsrc.c
gst/faceoverlay/gstfaceoverlay.c
gst/geometrictransform/gstgeometrictransform.c
gst/hls/gsthlsdemux.c
gst/inter/gstinteraudiosink.c
gst/inter/gstinteraudiosrc.c
gst/inter/gstintervideosink.c
gst/inter/gstintervideosrc.c
gst/jp2kdecimator/jp2kcodestream.c
gst/mpegdemux/gstmpegdemux.c
gst/mpegdemux/mpegtsparse.c
gst/mpegtsdemux/Makefile.am
gst/mpegtsdemux/mpegtsbase.c
gst/mpegtsdemux/mpegtsbase.h
gst/mpegtsdemux/mpegtspacketizer.c
gst/mpegtsdemux/mpegtspacketizer.h
gst/mpegtsdemux/tsdemux.c
gst/mxf/mxfdemux.c
gst/mxf/mxfmpeg.c
gst/rtpvp8/gstrtpvp8depay.c
gst/rtpvp8/gstrtpvp8pay.c
gst/siren/gstsirendec.c
gst/siren/gstsirenenc.c
gst/videoparsers/gsth263parse.c
gst/videoparsers/gsth264parse.c
gst/videoparsers/gstmpegvideoparse.c
sys/Makefile.am
sys/d3dvideosink/d3dvideosink.c
sys/decklink/gstdecklinksink.cpp
sys/decklink/gstdecklinksrc.cpp
sys/dvb/gstdvbsrc.c
sys/shm/gstshmsink.c
sys/shm/gstshmsrc.c
sys/vdpau/gstvdpsink.c
sys/vdpau/h264/gstvdph264dec.c
sys/vdpau/mpeg/gstvdpmpegdec.c
sys/winscreencap/gstdx9screencapsrc.c
sys/winscreencap/gstgdiscreencapsrc.c
tests/examples/scaletempo/demo-gui.c
tools/element-templates/element