mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 17:50:36 +00:00
225e98d623
Conflicts: ext/flac/gstflacenc.c ext/jack/gstjackaudioclient.c ext/jack/gstjackaudiosink.c ext/jack/gstjackaudiosrc.c ext/pulse/plugin.c ext/shout2/gstshout2.c gst/matroska/matroska-mux.c gst/rtp/gstrtph264pay.c |
||
---|---|---|
.. | ||
.gitignore | ||
gstcairo-marshal.list | ||
gstcairo.c | ||
gstcairooverlay.c | ||
gstcairooverlay.h | ||
gstcairorender.c | ||
gstcairorender.h | ||
gsttextoverlay.c | ||
gsttextoverlay.h | ||
gsttimeoverlay.c | ||
gsttimeoverlay.h | ||
Makefile.am |