mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-02 00:32:43 +00:00
bde3117e72
Conflicts: configure.ac ext/ffmpeg/gstffmpegcodecmap.c ext/ffmpeg/gstffmpegdec.c ext/ffmpeg/gstffmpegdeinterlace.c ext/ffmpeg/gstffmpegmux.c ext/libswscale/gstffmpegscale.c |
||
---|---|---|
.. | ||
gstpostproc.c | ||
Makefile.am |