Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 10 Feb 2012 15:46:50 +0000 (16:46 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 10 Feb 2012 15:46:50 +0000 (16:46 +0100)
commit1119f6ee4103990ccc55d521be08bdce10737c8e
treed2b9a31d43d6a1f832951a9c984127e27622211a
parent9fcfa6046d0e8e8ec89c32d7091b747088265d70
parent1cbd755a2cd45531076c7b19ef194b77d5575cb0
Merge branch 'master' into 0.11

Conflicts:
ext/chromaprint/gstchromaprint.c
ext/mpeg2enc/Makefile.am
ext/voaacenc/gstvoaacenc.c
gst/dvbsuboverlay/gstdvbsuboverlay.c
gst/mpegtsdemux/mpegtsbase.c
gst/sdp/gstsdpdemux.c
gst/videoparsers/gsth264parse.c
sys/d3dvideosink/d3dvideosink.c
tests/examples/camerabin/gst-camera-perf.c
tests/examples/camerabin/gst-camerabin-test.c
tests/examples/camerabin2/gst-camerabin2-test.c
tests/examples/mxf/mxfdemux-structure.c
tests/examples/scaletempo/demo-main.c
58 files changed:
ext/cog/gstcogmse.c
ext/curl/gstcurlsink.c
ext/faad/gstfaad.c
ext/kate/gstkateenc.c
ext/kate/gstkateparse.c
ext/kate/gstkatetiger.c
ext/kate/gstkateutil.c
ext/kate/gstkateutil.h
ext/modplug/gstmodplug.cc
ext/mpeg2enc/Makefile.am
ext/mpeg2enc/gstmpeg2enc.cc
ext/mplex/gstmplex.cc
ext/opus/gstopusenc.c
ext/resindvd/resindvdbin.c
ext/resindvd/resindvdsrc.c
ext/resindvd/rsnparsetter.c
ext/schroedinger/gstschrodec.c
ext/schroedinger/gstschroenc.c
ext/sdl/sdlaudiosink.c
ext/sdl/sdlvideosink.c
ext/voaacenc/gstvoaacenc.c
ext/voamrwbenc/gstvoamrwbenc.c
gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
gst-libs/gst/basecamerabinsrc/gstcamerabinpreview.c
gst-libs/gst/video/gstbasevideocodec.c
gst-libs/gst/video/gstbasevideodecoder.c
gst-libs/gst/video/gstbasevideoencoder.c
gst/aiff/aiffparse.c
gst/audiovisualizers/gstbaseaudiovisualizer.c
gst/camerabin/gstcamerabin.c
gst/camerabin/gstinputselector.c
gst/camerabin2/gstcamerabin2.c
gst/camerabin2/gstwrappercamerabinsrc.c
gst/cdxaparse/gstcdxaparse.c
gst/coloreffects/gstchromahold.c
gst/dvbsuboverlay/gstdvbsuboverlay.c
gst/dvdspu/gstdvdspu.c
gst/hls/gsthlsdemux.c
gst/liveadder/liveadder.c
gst/mpegdemux/gstmpegdemux.c
gst/mpegpsmux/mpegpsmux.c
gst/mpegtsdemux/mpegtsbase.c
gst/mpegtsdemux/tsdemux.c
gst/mpegtsmux/mpegtsmux.c
gst/mve/gstmvemux.c
gst/mxf/mxfdemux.c
gst/rawparse/gstrawparse.c
gst/sdp/gstsdpdemux.c
gst/tta/gstttaparse.c
gst/videoparsers/gsth264parse.c
gst/videoparsers/gstmpegvideoparse.c
sys/d3dvideosink/d3dvideosink.c
sys/decklink/gstdecklinksink.cpp
sys/decklink/gstdecklinksrc.cpp
sys/dvb/gstdvbsrc.c
sys/shm/gstshmsink.c
tests/examples/scaletempo/Makefile.am
tests/examples/scaletempo/demo-gui.c