← Back to branch summary

~ubuntu-branches/ubuntu/karmic/mplayer/karmic

« back to all changes in this revision

Viewing changes to libmpdemux/demux_rtp_codec.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-06-06 23:01:52 UTC
  • mfrom: (0.1.6 squeeze) (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20090606230152-qxn13xfnq65nz088
Tags: 2:1.0~rc3+svn20090426-1ubuntu1
https://launchpad.net/bugs/336697
https://launchpad.net/bugs/260918
https://launchpad.net/bugs/246675
https://launchpad.net/bugs/243453
https://launchpad.net/bugs/74282
https://launchpad.net/bugs/308939
https://launchpad.net/bugs/73271
https://launchpad.net/bugs/347021
* Switch to debian packaging for the mplayer package
* New upstream release, LP: #336697, #260918, #246675, #243453, #74282
* Fixes security issues: CVE-2008-5616, LP: #308939
* many flv fixes LP: #73271, #347021
* Build and install mencoder
* Bump epoch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmpdemux/demux_rtp_codec.cpp
6
6
#include <limits.h>
7
7
#include <math.h>
8
8
#include "stheader.h"
9
 
#include "base64.h"
 
9
#include "libavutil/base64.h"
10
10
}
11
11
 
12
 
#ifdef USE_LIBAVCODEC
 
12
#ifdef CONFIG_LIBAVCODEC
13
13
AVCodecParserContext * h264parserctx;
14
14
#endif
15
15
 
116
116
      = parseH264ConfigStr(subsession->fmtp_spropparametersets(), configLen);
117
117
    sh_video->bih = bih = insertVideoExtradata(bih, configData, configLen);
118
118
    delete[] configData;
119
 
#ifdef USE_LIBAVCODEC
 
119
#ifdef CONFIG_LIBAVCODEC
120
120
    avcodec_register_all();
121
121
    h264parserctx = av_parser_init(CODEC_ID_H264);
122
122
#endif
198
198
  sh_audio->wf = wf;
199
199
  demux_stream_t* d_audio = demuxer->audio;
200
200
  d_audio->sh = sh_audio; sh_audio->ds = d_audio;
 
201
  d_audio->id = sh_audio->aid;
201
202
  
202
203
  wf->nChannels = subsession->numChannels();
203
204
 
327
328
  // figure out the frame rate by itself, so (unless the user specifies
328
329
  // it manually, using "-fps") we figure it out ourselves here, using the
329
330
  // presentation timestamps in successive packets,
330
 
  extern float force_fps; if (force_fps != 0.0) return; // user used "-fps"
 
331
  extern double force_fps; if (force_fps != 0.0) return; // user used "-fps"
331
332
 
332
333
  demux_stream_t* d_video = demuxer->video;
333
334
  sh_video_t* sh_video = (sh_video_t*)(d_video->sh);