-
Tim-Philipp Müller authored
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.
fb6d0905