gstreamer/tests/examples/encoding
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 examples: encoding example 2010-12-15 11:54:32 +01:00
encoding.c Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
gstcapslist.c tests: fix unused-but-set-variable warnings with gcc 4.6 2011-04-14 00:24:26 +01:00
gstcapslist.h examples: encoding example 2010-12-15 11:54:32 +01:00
Makefile.am build: add audio libs (pulled by pbutils) to avoid linking against system version 2011-11-04 15:37:42 +01:00