Mercurial > mplayer.hg
changeset 34173:a5d8b198c214
demux_rtp: Replace extern declarations by proper header #includes.
| author | diego |
|---|---|
| date | Wed, 26 Oct 2011 15:12:25 +0000 |
| parents | 5761a9a31bcb |
| children | a93891202051 |
| files | libmpdemux/demux_rtp.cpp libmpdemux/demux_rtp_codec.cpp |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_rtp.cpp Tue Oct 25 20:45:09 2011 +0000 +++ b/libmpdemux/demux_rtp.cpp Wed Oct 26 15:12:25 2011 +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 "mp_msg.h" #include "demuxer.h" #include "demux_rtp.h" #include "stheader.h" @@ -146,7 +147,6 @@ // 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;
--- a/libmpdemux/demux_rtp_codec.cpp Tue Oct 25 20:45:09 2011 +0000 +++ b/libmpdemux/demux_rtp_codec.cpp Wed Oct 26 15:12:25 2011 +0000 @@ -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 @@ // 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);