← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to libmpdemux/demux_rtp_codec.cpp

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmpdemux/demux_rtp_codec.cpp
23
23
extern "C" {
24
24
#include <limits.h>
25
25
#include <math.h>
 
26
 
 
27
#include "mpcommon.h"
26
28
#include "stheader.h"
27
29
#include "libavutil/base64.h"
28
30
}
359
361
  // figure out the frame rate by itself, so (unless the user specifies
360
362
  // it manually, using "-fps") we figure it out ourselves here, using the
361
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
366
  demux_stream_t* d_video = demuxer->video;
365
367
  sh_video_t* sh_video = (sh_video_t*)(d_video->sh);