mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-21 15:56:42 +00:00
17bfba09f1
Conflicts: ext/ogg/gstoggdemux.c ext/pango/gsttextoverlay.c gst-libs/gst/audio/gstaudioencoder.c gst-libs/gst/audio/gstbaseaudiosrc.c gst/playback/gstsubtitleoverlay.c gst/videorate/gstvideorate.c |
||
---|---|---|
.. | ||
design-audiosinks.txt | ||
design-decodebin.txt | ||
design-encoding.txt | ||
design-orc-integration.txt | ||
draft-keyframe-force.txt | ||
draft-media-types.txt | ||
draft-va.txt | ||
Makefile.am | ||
part-interlaced-video.txt | ||
part-playbin2.txt |