Merge remote branches 'jn/ffmpeg' and 'jn/wsp'
This commit is contained in:
		| @@ -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" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Max Kellermann
					Max Kellermann