Mercurial > mplayer.hg

changeset 31417:ca9623cfa117

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move cdda_opts extern declaration to stream/cdd.h.
author diego
date Sun, 20 Jun 2010 15:00:11 +0000
parents 14f43ed62015
children d2fd0e4d0b9a
files cfg-common.h stream/cdd.h
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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"
--- 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;