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

This commit is contained in:
Max Kellermann 2012-02-15 21:49:20 +01:00
commit 1a63663c85

View File

@ -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"