-
Max Kellermann authored
Conflicts: src/decoder/ffmpeg_decoder_plugin.c src/input/ffmpeg_input_plugin.c
9937ff8a
To find the state of this project's repository at the time of any of these versions, check out
the tags.
Conflicts: src/decoder/ffmpeg_decoder_plugin.c src/input/ffmpeg_input_plugin.c