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

1a63663c · Max Kellermann · 00a20fc8 · 6ab4fb36 · 1a63663c
Commit 1a63663c authored Feb 15, 2012 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

cdio_paranoia_input_plugin.c src/input/cdio_paranoia_input_plugin.c +2 -2

No files found.
--- a/src/input/cdio_paranoia_input_plugin.c
+++ b/src/input/cdio_paranoia_input_plugin.c
@@ -18,8 +18,8 @@
 */

 /**
-  * CD-Audio handling (requires libcdio_paranoia)
-  */
+ * CD-Audio handling (requires libcdio_paranoia)
+ */

 #include "config.h"
 #include "input/cdio_paranoia_input_plugin.h"