# HG changeset patch
# User diego
# Date 1277046011 0
# Node ID ca9623cfa117ec2301f38a74b3736623c30f6b41
# Parent  14f43ed62015fe1fb042e493dcb7c96618c9ea16
Move cdda_opts extern declaration to stream/cdd.h.

diff -r 14f43ed62015 -r ca9623cfa117 cfg-common.h
--- a/cfg-common.h	Sun Jun 20 14:40:42 2010 +0000
+++ b/cfg-common.h	Sun Jun 20 15:00:11 2010 +0000
@@ -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 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"
diff -r 14f43ed62015 -r ca9623cfa117 stream/cdd.h
--- a/stream/cdd.h	Sun Jun 20 14:40:42 2010 +0000
+++ b/stream/cdd.h	Sun Jun 20 15:00:11 2010 +0000
@@ -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;