[MPlayer-cvslog] r31505 - in trunk: cfg-common.h libmpdemux/demuxer.h

[diego]

Author: diego
Date: Mon Jun 21 11:55:59 2010
New Revision: 31505

Log:
Move demuxer-specific option array declarations to demuxer.h.

Modified:
   trunk/cfg-common.h
   trunk/libmpdemux/demuxer.h

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Mon Jun 21 11:51:26 2010	(r31504)
+++ trunk/cfg-common.h	Mon Jun 21 11:55:59 2010	(r31505)
@@ -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 @@ const m_option_t pvropts_conf[]={
 #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;

Modified: trunk/libmpdemux/demuxer.h
==============================================================================
--- trunk/libmpdemux/demuxer.h	Mon Jun 21 11:51:26 2010	(r31504)
+++ trunk/libmpdemux/demuxer.h	Mon Jun 21 11:55:59 2010	(r31505)
@@ -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_http;
 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
  */