# HG changeset patch
# User diego
# Date 1277371429 0
# Node ID a295c59e1a48cc9ab5f267bf5a60f95c0268df02
# Parent  df32031b080792db3065bba29c3607c2965f0ae5
Move rtsp_port extern declaration to demuxer.h.

diff -r df32031b0807 -r a295c59e1a48 cfg-common.h
--- a/cfg-common.h	Thu Jun 24 08:15:46 2010 +0000
+++ b/cfg-common.h	Thu Jun 24 09:23:49 2010 +0000
@@ -150,8 +150,6 @@
 };
 #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},
diff -r df32031b0807 -r a295c59e1a48 libmpdemux/demux_rtp.cpp
--- a/libmpdemux/demux_rtp.cpp	Thu Jun 24 08:15:46 2010 +0000
+++ b/libmpdemux/demux_rtp.cpp	Thu Jun 24 09:23:49 2010 +0000
@@ -24,6 +24,7 @@
 #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_http = 0;
 #endif
 
-extern int rtsp_port;
 #ifdef CONFIG_LIBAVCODEC
 extern AVCodecContext *avcctx;
 #endif
diff -r df32031b0807 -r a295c59e1a48 libmpdemux/demuxer.h
--- a/libmpdemux/demuxer.h	Thu Jun 24 08:15:46 2010 +0000
+++ b/libmpdemux/demuxer.h	Thu Jun 24 09:23:49 2010 +0000
@@ -184,6 +184,7 @@
 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;