mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-05 14:16:06 +00:00
Conflicts: common docs/libs/gst-plugins-base-libs.types ext/pango/gsttextoverlay.c ext/vorbis/gstvorbisdec.c gst/playback/gstplaysink.c gst/playback/gstplaysinkconvertbin.c sys/ximage/ximagesink.c sys/xvimage/xvimagesink.c |
||
---|---|---|
.. | ||
ximage | ||
xvimage | ||
Makefile.am |