[MPlayer-cvslog] r31549 - in trunk: cfg-common.h libmpdemux/demux_rtp.cpp libmpdemux/demuxer.h

[diego]

Author: diego
Date: Thu Jun 24 11:23:49 2010
New Revision: 31549

Log:
Move rtsp_port extern declaration to demuxer.h.

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

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Thu Jun 24 10:15:46 2010	(r31548)
+++ trunk/cfg-common.h	Thu Jun 24 11:23:49 2010	(r31549)
@@ -150,8 +150,6 @@ const m_option_t pvropts_conf[]={
 };
 #endif /* CONFIG_PVR */
 
-extern int rtsp_port;
-
 const m_option_t scaler_filter_conf[]={
     {"lgb", &sws_lum_gblur, CONF_TYPE_FLOAT, 0, 0, 100.0, NULL},
     {"cgb", &sws_chr_gblur, CONF_TYPE_FLOAT, 0, 0, 100.0, NULL},

Modified: trunk/libmpdemux/demux_rtp.cpp
==============================================================================
--- trunk/libmpdemux/demux_rtp.cpp	Thu Jun 24 10:15:46 2010	(r31548)
+++ trunk/libmpdemux/demux_rtp.cpp	Thu Jun 24 11:23:49 2010	(r31549)
@@ -24,6 +24,7 @@ extern "C" {
 #ifdef __MINGW32__    // with.  they are each protected from
 #include <windows.h>  // windows.h, but not the other way around.
 #endif
+#include "demuxer.h"
 #include "demux_rtp.h"
 #include "stheader.h"
 }
@@ -118,7 +119,6 @@ int rtsp_transport_tcp = 0;
 int rtsp_transport_http = 0;
 #endif
 
-extern int rtsp_port;
 #ifdef CONFIG_LIBAVCODEC
 extern AVCodecContext *avcctx;
 #endif

Modified: trunk/libmpdemux/demuxer.h
==============================================================================
--- trunk/libmpdemux/demuxer.h	Thu Jun 24 10:15:46 2010	(r31548)
+++ trunk/libmpdemux/demuxer.h	Thu Jun 24 11:23:49 2010	(r31549)
@@ -184,6 +184,7 @@ extern int correct_pts;
 extern int user_correct_pts;
 extern char *sub_stream;
 
+extern int rtsp_port;
 extern int rtsp_transport_http;
 extern int rtsp_transport_sctp;
 extern int rtsp_transport_tcp;