mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-28 19:20:35 +00:00
Code Issues 1 Projects Releases Wiki Activity
gstreamer/tests/examples/overlay
History
Tim-Philipp Müller fb6d09055a 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.
2011-12-08 01:19:03 +00:00
..
.gitignore tests: update for GstXOverlay => GstVideoOverlay 2011-08-08 14:12:15 +01:00
gtk-videooverlay.c Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
Makefile.am video: move some interfaces 2011-11-29 19:10:01 +01:00
qt-videooverlay.cpp Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
qtgv-videooverlay.cpp video: move some interfaces 2011-11-29 19:10:01 +01:00
qtgv-videooverlay.h tests: update for GstXOverlay => GstVideoOverlay 2011-08-08 14:12:15 +01:00