mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-20 00:31:13 +00:00
a2a4300241
Conflicts: configure.ac ext/kate/gstkateenc.c gst/colorspace/colorspace.c gst/mpegvideoparse/mpegvideoparse.c |
||
---|---|---|
.. | ||
gstnuvdemux.c | ||
gstnuvdemux.h | ||
Makefile.am |