review.tizen.org Git - platform/upstream/gstreamer.git/commit

projects / platform / upstream / gstreamer.git / commit

author	Tim-Philipp Müller <tim.muller@collabora.co.uk>
	Thu, 8 Dec 2011 01:19:03 +0000 (01:19 +0000)
committer	Tim-Philipp Müller <tim.muller@collabora.co.uk>
	Thu, 8 Dec 2011 01:19:03 +0000 (01:19 +0000)
commit	fb6d09055ae90979682fa4b1c6ee4f4abdaafd8f
tree	3215796950bfe6630098dff0d3897996ba8882ab	tree \| snapshot
parent	f096b8a8d81239e22477f222d774f8c48a03b06e	commit \| diff
parent	91bbfbd819f6a347be114ee280dd5bb5b0ab1385	commit \| diff

Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
ext/alsa/gstalsadeviceprobe.c
ext/alsa/gstalsamixer.c
ext/pango/gsttextoverlay.c
ext/pango/gsttextoverlay.h
gst-libs/gst/audio/gstaudiobasesink.c
gst-libs/gst/audio/gstaudioringbuffer.c
gst-libs/gst/audio/gstaudiosrc.c
gst-libs/gst/video/Makefile.am
gst-libs/gst/video/video.c
gst/encoding/gststreamcombiner.c
gst/encoding/gststreamsplitter.c
gst/playback/gstplaybasebin.c
gst/playback/gststreamsynchronizer.c
gst/playback/gstsubtitleoverlay.c
gst/playback/gsturidecodebin.c
sys/xvimage/xvimagesink.c
tests/examples/Makefile.am
win32/common/libgstvideo.def

Video overlay composition disabled for now, needs
porting to buffer meta.

44 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
docs/libs/gst-plugins-base-libs-docs.sgml	diff1 \|	diff2 \|	blob \| history
docs/libs/gst-plugins-base-libs-sections.txt	diff1 \|	diff2 \|	blob \| history
ext/alsa/gstalsamixer.c	diff1 \|	diff2 \|	blob \| history
ext/alsa/gstalsamixer.h	diff1 \|	diff2 \|	blob \| history
ext/alsa/gstalsasink.c	diff1 \|	diff2 \|	blob \| history
ext/alsa/gstalsasrc.c	diff1 \|	diff2 \|	blob \| history
ext/ogg/gstoggdemux.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/Makefile.am	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/app/gstappsink.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/app/gstappsrc.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/gstaudiobasesink.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/gstaudiodecoder.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/gstaudioencoder.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/gstaudioringbuffer.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/gstaudiosink.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/gstaudiosrc.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/pbutils/gstdiscoverer.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/rtsp/gstrtspconnection.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/video/convertframe.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/video/videooverlay.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstdecodebin.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstdecodebin2.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstplaybin2.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstplaysink.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstplaysinkconvertbin.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gststreamsynchronizer.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstsubtitleoverlay.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gsturidecodebin.c	diff1 \|	diff2 \|	blob \| history
gst/tcp/gstmultifdsink.c	diff1 \|	diff2 \|	blob \| history
gst/videorate/gstvideorate.c	diff1 \|	diff2 \|	blob \| history
sys/ximage/ximagesink.c	diff1 \|	diff2 \|	blob \| history
sys/xvimage/xvimagesink.c	diff1 \|	diff2 \|	blob \| history
tests/check/libs/video.c	diff1 \|	diff2 \|	blob \| history
tests/examples/Makefile.am	diff1 \|	diff2 \|	blob \| history
tests/examples/encoding/encoding.c	diff1 \|	diff2 \|	blob \| history
tests/examples/overlay/gtk-videooverlay.c	diff1 \|	diff2 \|	blob \| history
tests/examples/overlay/qt-videooverlay.cpp	diff1 \|	diff2 \|	blob \| history
tests/examples/seek/jsseek.c	diff1 \|	diff2 \|	blob \| history
tests/examples/seek/scrubby.c	diff1 \|	diff2 \|	blob \| history
tests/examples/seek/seek.c	diff1 \|	diff2 \|	blob \| history
tests/icles/test-colorkey.c	diff1 \|	diff2 \|	blob \| history
tests/icles/test-videooverlay.c	diff1 \|	diff2 \|	blob \| history
tools/gst-discoverer.c	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Common;

RSS Atom

configure.ac	diff1 \|	diff2 \|	blob \| history
docs/libs/gst-plugins-base-libs-docs.sgml	diff1 \|	diff2 \|	blob \| history
docs/libs/gst-plugins-base-libs-sections.txt	diff1 \|	diff2 \|	blob \| history
ext/alsa/gstalsamixer.c	diff1 \|	diff2 \|	blob \| history
ext/alsa/gstalsamixer.h	diff1 \|	diff2 \|	blob \| history
ext/alsa/gstalsasink.c	diff1 \|	diff2 \|	blob \| history
ext/alsa/gstalsasrc.c	diff1 \|	diff2 \|	blob \| history
ext/ogg/gstoggdemux.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/Makefile.am	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/app/gstappsink.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/app/gstappsrc.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/gstaudiobasesink.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/gstaudiodecoder.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/gstaudioencoder.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/gstaudioringbuffer.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/gstaudiosink.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/audio/gstaudiosrc.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/pbutils/gstdiscoverer.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/rtsp/gstrtspconnection.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/video/convertframe.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/video/videooverlay.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstdecodebin.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstdecodebin2.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstplaybin2.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstplaysink.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstplaysinkconvertbin.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gststreamsynchronizer.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstsubtitleoverlay.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gsturidecodebin.c	diff1 \|	diff2 \|	blob \| history
gst/tcp/gstmultifdsink.c	diff1 \|	diff2 \|	blob \| history
gst/videorate/gstvideorate.c	diff1 \|	diff2 \|	blob \| history
sys/ximage/ximagesink.c	diff1 \|	diff2 \|	blob \| history
sys/xvimage/xvimagesink.c	diff1 \|	diff2 \|	blob \| history
tests/check/libs/video.c	diff1 \|	diff2 \|	blob \| history
tests/examples/Makefile.am	diff1 \|	diff2 \|	blob \| history
tests/examples/encoding/encoding.c	diff1 \|	diff2 \|	blob \| history
tests/examples/overlay/gtk-videooverlay.c	diff1 \|	diff2 \|	blob \| history
tests/examples/overlay/qt-videooverlay.cpp	diff1 \|	diff2 \|	blob \| history
tests/examples/seek/jsseek.c	diff1 \|	diff2 \|	blob \| history
tests/examples/seek/scrubby.c	diff1 \|	diff2 \|	blob \| history
tests/examples/seek/seek.c	diff1 \|	diff2 \|	blob \| history
tests/icles/test-colorkey.c	diff1 \|	diff2 \|	blob \| history
tests/icles/test-videooverlay.c	diff1 \|	diff2 \|	blob \| history
tools/gst-discoverer.c	diff1 \|	diff2 \|	blob \| history