[MPlayer-cvslog] r34261 - in trunk/libmpdemux: demux_rtp.cpp demux_rtp_codec.cpp

[diego]

Author: diego
Date: Wed Oct 26 17:12:25 2011
New Revision: 34261

Log:
demux_rtp: Replace extern declarations by proper header #includes.

Modified:
   trunk/libmpdemux/demux_rtp.cpp
   trunk/libmpdemux/demux_rtp_codec.cpp

Modified: trunk/libmpdemux/demux_rtp.cpp
==============================================================================
--- trunk/libmpdemux/demux_rtp.cpp	Tue Oct 25 22:45:09 2011	(r34260)
+++ trunk/libmpdemux/demux_rtp.cpp	Wed Oct 26 17:12:25 2011	(r34261)
@@ -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 "mp_msg.h"
 #include "demuxer.h"
 #include "demux_rtp.h"
 #include "stheader.h"
@@ -146,7 +147,6 @@ extern "C" demuxer_t* demux_open_rtp(dem
       // we were given a RTSP or SIP URL:
       char const* protocol = demuxer->stream->streaming_ctrl->url->protocol;
       char const* url = demuxer->stream->streaming_ctrl->url->url;
-      extern int verbose;
       if (strcmp(protocol, "rtsp") == 0) {
 	if (rtsp_transport_http == 1) {
 	  rtsp_transport_http = demuxer->stream->streaming_ctrl->url->port;

Modified: trunk/libmpdemux/demux_rtp_codec.cpp
==============================================================================
--- trunk/libmpdemux/demux_rtp_codec.cpp	Tue Oct 25 22:45:09 2011	(r34260)
+++ trunk/libmpdemux/demux_rtp_codec.cpp	Wed Oct 26 17:12:25 2011	(r34261)
@@ -23,6 +23,8 @@
 extern "C" {
 #include <limits.h>
 #include <math.h>
+
+#include "mpcommon.h"
 #include "stheader.h"
 #include "libavutil/base64.h"
 }
@@ -359,7 +361,7 @@ static void needVideoFrameRate(demuxer_t
   // figure out the frame rate by itself, so (unless the user specifies
   // it manually, using "-fps") we figure it out ourselves here, using the
   // presentation timestamps in successive packets,
-  extern double force_fps; if (force_fps != 0.0) return; // user used "-fps"
+  if (force_fps != 0.0) return; // user used "-fps"
 
   demux_stream_t* d_video = demuxer->video;
   sh_video_t* sh_video = (sh_video_t*)(d_video->sh);