mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-18 14:26:43 +00:00
f562a29284
Conflicts: ext/theora/gsttheoraenc.c gst-libs/gst/tag/gstexiftag.c gst/adder/gstadder.c gst/adder/gstadder.h gst/playback/gstdecodebin2.c gst/playback/gstsubtitleoverlay.c tests/check/libs/tag.c |
||
---|---|---|
.. | ||
.gitignore | ||
adder.vcproj | ||
gstadder.c | ||
gstadder.h | ||
gstadderorc-dist.c | ||
gstadderorc-dist.h | ||
gstadderorc.orc | ||
Makefile.am |