Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 2 Dec 2011 11:10:17 +0000 (11:10 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 2 Dec 2011 11:10:17 +0000 (11:10 +0000)
commit177525f89f6a93d12c7d69a39e198e888140fb5b
treebad83715dd58a2a318983114871915824bf8c123
parentec0d3566bf15b6daa18f0df01b044b7cecfd9e45
parent14644457b06f48b26f32f88ef91e1286a48ebe24
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
gst-libs/gst/netbuffer/gstnetbuffer.c
gst/ffmpegcolorspace/avcodec.h
gst/ffmpegcolorspace/gstffmpegcodecmap.c
gst/ffmpegcolorspace/imgconvert.c
gst/ffmpegcolorspace/imgconvert_template.h
gst/ffmpegcolorspace/mem.c
gst/playback/README
gst/playback/gstplaybasebin.c
gst/playback/gstplaybasebin.h
gst/playback/gstplaybin.c
sys/v4l/v4lmjpegsrc_calls.c
sys/v4l/videodev_mjpeg.h
tests/check/elements/gnomevfssink.c
57 files changed:
docs/design/design-decodebin.txt
docs/design/design-encoding.txt
ext/alsa/gstalsamixer.c
ext/libvisual/visual.c
ext/ogg/gstoggdemux.c
ext/theora/gsttheoradec.c
ext/theora/gsttheoradec.h
ext/theora/gsttheoraparse.c
ext/vorbis/gstvorbisdec.c
gst-libs/gst/app/gstappsink.c
gst-libs/gst/app/gstappsrc.c
gst-libs/gst/app/gstappsrc.h
gst-libs/gst/audio/audio.c
gst-libs/gst/audio/gstaudiobasesink.c
gst-libs/gst/audio/gstaudiobasesrc.c
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/audio/gstaudioringbuffer.c
gst-libs/gst/audio/multichannel.h
gst-libs/gst/fft/gstfftf32.c
gst-libs/gst/fft/gstfftf64.c
gst-libs/gst/fft/gstffts16.c
gst-libs/gst/fft/gstffts32.c
gst-libs/gst/interfaces/navigation.c
gst-libs/gst/pbutils/descriptions.c
gst-libs/gst/pbutils/encoding-profile.c
gst-libs/gst/pbutils/encoding-target.h
gst-libs/gst/pbutils/gstdiscoverer-types.c
gst-libs/gst/pbutils/gstdiscoverer.c
gst-libs/gst/rtp/gstrtcpbuffer.c
gst-libs/gst/rtp/gstrtpbaseaudiopayload.c
gst-libs/gst/rtp/gstrtpbuffer.c
gst-libs/gst/rtsp/gstrtspconnection.c
gst-libs/gst/tag/gstexiftag.c
gst-libs/gst/tag/gstvorbistag.c
gst-libs/gst/tag/gstxmptag.c
gst-libs/gst/video/videooverlay.c
gst/adder/gstadder.c
gst/audioconvert/audioconvert.c
gst/audiorate/gstaudiorate.c
gst/audioresample/gstaudioresample.c
gst/audioresample/resample.c
gst/encoding/gststreamsplitter.c
gst/playback/gstdecodebin.c
gst/playback/gstdecodebin2.c
gst/playback/gstplaybin2.c
gst/playback/gstplaysink.c
gst/playback/gsturidecodebin.c
gst/tcp/gstmultifdsink.c
gst/tcp/gsttcp.c
gst/typefind/gsttypefindfunctions.c
gst/videotestsrc/gstvideotestsrc.c
sys/xvimage/xvimagesink.c
sys/xvimage/xvimagesink.h
tests/check/elements/adder.c
tests/check/elements/audioresample.c
tests/check/elements/textoverlay.c
tests/examples/encoding/encoding.c