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

[diego]

Author: diego
Date: Mon Jun 21 16:40:28 2010
New Revision: 31517

Log:
Move dvbin_opts_conf extern variable declaration to stream.h.

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

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Mon Jun 21 16:39:24 2010	(r31516)
+++ trunk/cfg-common.h	Mon Jun 21 16:40:28 2010	(r31517)
@@ -37,6 +37,7 @@
 #include "stream/cdd.h"
 #include "stream/network.h"
 #include "stream/pvr.h"
+#include "stream/stream.h"
 #include "stream/stream_dvd_common.h"
 #include "stream/stream_radio.h"
 #include "stream/tcp.h"
@@ -149,8 +150,6 @@ const m_option_t pvropts_conf[]={
 };
 #endif /* CONFIG_PVR */
 
-extern const m_option_t dvbin_opts_conf[];
-
 extern int rtsp_port;
 extern char *rtsp_destination;
 

Modified: trunk/stream/stream.h
==============================================================================
--- trunk/stream/stream.h	Mon Jun 21 16:39:24 2010	(r31516)
+++ trunk/stream/stream.h	Mon Jun 21 16:40:28 2010	(r31517)
@@ -20,6 +20,7 @@
 #define MPLAYER_STREAM_H
 
 #include "config.h"
+#include "m_option.h"
 #include "mp_msg.h"
 #include "url.h"
 #include <string.h>
@@ -339,6 +340,8 @@ extern char * audio_stream;
 extern char *cdrom_device;
 extern char *dvd_device;
 
+extern const m_option_t dvbin_opts_conf[];
+
 typedef struct {
  int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm
  int language;