Tim-Philipp Müller
|
576bbb4fd8
|
Remove compatibility code cruft for old GLib versions
|
2012-01-18 17:22:21 +00:00 |
|
|
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 |
|
Wim Taymans
|
552e825b4f
|
fix includes for moved interfaces
|
2011-11-30 07:23:47 +01:00 |
|
|
Tim-Philipp Müller
|
4b0dce5148
|
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
gst-libs/gst/audio/Makefile.am
gst-libs/gst/audio/audio.h
tests/examples/seek/jsseek.c
tests/examples/seek/seek.c
tests/icles/test-colorkey.c
|
2011-11-13 13:36:29 +00:00 |
|
|
Tim-Philipp Müller
|
789e325678
|
tests: update for GstXOverlay => GstVideoOverlay
|
2011-08-08 14:12:15 +01:00 |
|