- 
Max Kellermann authoredConflicts: NEWS configure.ac src/decoder/ffmpeg_plugin.c src/update.c 806496df
To find the state of this project's repository at the time of any of these versions, check out
the tags.
Conflicts: NEWS configure.ac src/decoder/ffmpeg_plugin.c src/update.c