Commit 1a63663c authored by Max Kellermann's avatar Max Kellermann

Merge remote branches 'jn/ffmpeg' and 'jn/wsp'

parents 00a20fc8 6ab4fb36
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
*/ */
/** /**
* CD-Audio handling (requires libcdio_paranoia) * CD-Audio handling (requires libcdio_paranoia)
*/ */
#include "config.h" #include "config.h"
#include "input/cdio_paranoia_input_plugin.h" #include "input/cdio_paranoia_input_plugin.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment