[MPlayer-cvslog] r37468 - trunk/stream/stream_vcd.c

[ib]

Author: ib
Date: Mon Aug 31 10:14:54 2015
New Revision: 37468

Log:
Prefer playing VCD with libcdio.

If libcdio is available (autodetected) on FreeBSD, Darwin, Win32 or
OS/2, prefer its usage to the OS specific driver - libcdio is expected
to work then.

In case libcdio will be autodetected but is broken, --disable-libcdio
should be used.

This fixes a build error on MinGW-w64.

Modified:
   trunk/stream/stream_vcd.c

Modified: trunk/stream/stream_vcd.c
==============================================================================
--- trunk/stream/stream_vcd.c	Sun Aug 30 17:25:52 2015	(r37467)
+++ trunk/stream/stream_vcd.c	Mon Aug 31 10:14:54 2015	(r37468)
@@ -38,7 +38,9 @@
 #endif
 #include <errno.h>
 
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if CONFIG_LIBCDIO
+#include "vcd_read_libcdio.h"
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #include "vcd_read_fbsd.h"
 #elif defined(__APPLE__)
 #include "vcd_read_darwin.h"
@@ -46,8 +48,6 @@
 #include "vcd_read_win32.h"
 #elif defined(__OS2__)
 #include "vcd_read_os2.h"
-#elif CONFIG_LIBCDIO
-#include "vcd_read_libcdio.h"
 #else
 #include "vcd_read.h"
 #endif