[MPlayer-cvslog] r31483 - in trunk: cfg-common.h stream/cdd.h

[diego]

Author: diego
Date: Sun Jun 20 17:00:11 2010
New Revision: 31483

Log:
Move cdda_opts extern declaration to stream/cdd.h.

Modified:
   trunk/cfg-common.h
   trunk/stream/cdd.h

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Sun Jun 20 16:40:42 2010	(r31482)
+++ trunk/cfg-common.h	Sun Jun 20 17:00:11 2010	(r31483)
@@ -40,6 +40,10 @@
 #include "stream/stream_dvd_common.h"
 #include "codec-cfg.h"
 
+#ifdef CONFIG_CDDA
+#include "stream/cdd.h"
+#endif
+
 extern int network_prefer_ipv4;
 extern int reuse_socket;
 
@@ -47,7 +51,6 @@ extern int reuse_socket;
 extern int hr_mp3_seek;
 extern const m_option_t demux_rawaudio_opts[];
 extern const m_option_t demux_rawvideo_opts[];
-extern const m_option_t cdda_opts[];
 
 
 #include "stream/tv.h"

Modified: trunk/stream/cdd.h
==============================================================================
--- trunk/stream/cdd.h	Sun Jun 20 16:40:42 2010	(r31482)
+++ trunk/stream/cdd.h	Sun Jun 20 17:00:11 2010	(r31483)
@@ -29,6 +29,10 @@
 #endif
 #include <sys/types.h>
 
+#include "m_option.h"
+
+extern const m_option_t cdda_opts[];
+
 typedef struct {
 	char cddb_hello[1024];
 	unsigned long disc_id;