GST-Tensordecoder-ov_ep

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

.gitignore: update after files got renamed

2009-10-17 21:11:10 +01:00

gstrtsp-marshal.list

libs: touch marshal.list files to force rebuild after Makefile.am changes

2010-10-19 00:07:47 +01:00

gstrtsp.h

gst-libs/gst/: Move the rtspextension.h interface into gstrtspextension.h as part of libgstrtsp instead of libgstinte...

2007-07-26 19:57:15 +00:00

gstrtspconnection.c

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