# HG changeset patch
# User diego
# Date 1277114159 0
# Node ID c0d4771c11c741165680a47772866333d9b0a019
# Parent  3afcf20a13e405bd25aaac8b385606065e620d5a
Move demuxer-specific option array declarations to demuxer.h.

diff -r 3afcf20a13e4 -r c0d4771c11c7 cfg-common.h
--- a/cfg-common.h	Mon Jun 21 09:51:26 2010 +0000
+++ b/cfg-common.h	Mon Jun 21 09:55:59 2010 +0000
@@ -50,11 +50,6 @@
 #include "stream/cdd.h"
 #endif
 
-/* defined in libmpdemux: */
-extern const m_option_t demux_rawaudio_opts[];
-extern const m_option_t demux_rawvideo_opts[];
-
-
 #include "stream/tv.h"
 #include "stream/stream_radio.h"
 
@@ -159,7 +154,6 @@
 #endif /* CONFIG_PVR */
 
 extern const m_config_t dvbin_opts_conf[];
-extern const m_option_t lavfdopts_conf[];
 
 extern int rtsp_port;
 extern char *rtsp_destination;
diff -r 3afcf20a13e4 -r c0d4771c11c7 libmpdemux/demuxer.h
--- a/libmpdemux/demuxer.h	Mon Jun 21 09:51:26 2010 +0000
+++ b/libmpdemux/demuxer.h	Mon Jun 21 09:55:59 2010 +0000
@@ -28,6 +28,7 @@
 #ifdef CONFIG_ASS
 #include "libass/ass_mp.h"
 #endif
+#include "m_option.h"
 
 #ifdef HAVE_BUILTIN_EXPECT
 #define likely(x) __builtin_expect ((x) != 0, 1)
@@ -187,6 +188,11 @@
 extern int rtsp_transport_sctp;
 extern int rtsp_transport_tcp;
 
+extern const m_option_t demux_rawaudio_opts[];
+extern const m_option_t demux_rawvideo_opts[];
+extern const m_option_t lavfdopts_conf[];
+
+
 /**
  * Demuxer description structure
  */