-
Max Kellermann authored
Conflicts: Makefile.am NEWS configure.ac src/decoder/ffmpeg_decoder_plugin.c src/decoder_thread.c
a0a26d33
To find the state of this project's repository at the time of any of these versions, check out
the tags.
Conflicts: Makefile.am NEWS configure.ac src/decoder/ffmpeg_decoder_plugin.c src/decoder_thread.c