Mercurial > mplayer.hg
comparison libmpdemux/demux_rtp_codec.cpp @ 34173:a5d8b198c214
demux_rtp: Replace extern declarations by proper header #includes.
author | diego |
---|---|
date | Wed, 26 Oct 2011 15:12:25 +0000 |
parents | 8fa2f43cb760 |
children | f3d53cd55376 |
comparison
equal
deleted
inserted
replaced
34172:5761a9a31bcb | 34173:a5d8b198c214 |
---|---|
21 | 21 |
22 #include "demux_rtp_internal.h" | 22 #include "demux_rtp_internal.h" |
23 extern "C" { | 23 extern "C" { |
24 #include <limits.h> | 24 #include <limits.h> |
25 #include <math.h> | 25 #include <math.h> |
26 | |
27 #include "mpcommon.h" | |
26 #include "stheader.h" | 28 #include "stheader.h" |
27 #include "libavutil/base64.h" | 29 #include "libavutil/base64.h" |
28 } | 30 } |
29 | 31 |
30 #ifdef CONFIG_FFMPEG | 32 #ifdef CONFIG_FFMPEG |
357 MediaSubsession* subsession) { | 359 MediaSubsession* subsession) { |
358 // For some codecs, MPlayer's decoding software can't (or refuses to :-) | 360 // For some codecs, MPlayer's decoding software can't (or refuses to :-) |
359 // figure out the frame rate by itself, so (unless the user specifies | 361 // figure out the frame rate by itself, so (unless the user specifies |
360 // it manually, using "-fps") we figure it out ourselves here, using the | 362 // it manually, using "-fps") we figure it out ourselves here, using the |
361 // presentation timestamps in successive packets, | 363 // presentation timestamps in successive packets, |
362 extern double force_fps; if (force_fps != 0.0) return; // user used "-fps" | 364 if (force_fps != 0.0) return; // user used "-fps" |
363 | 365 |
364 demux_stream_t* d_video = demuxer->video; | 366 demux_stream_t* d_video = demuxer->video; |
365 sh_video_t* sh_video = (sh_video_t*)(d_video->sh); | 367 sh_video_t* sh_video = (sh_video_t*)(d_video->sh); |
366 | 368 |
367 // If we already know the subsession's video frame rate, use it: | 369 // If we already know the subsession's video frame rate, use it: |