← Back to branch summary

~ubuntu-branches/ubuntu/precise/ffmpeg-debian/precise

« back to all changes in this revision

Viewing changes to libavformat/rtpdec.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-01-20 09:20:53 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090120092053-izz63p40hc98qfgp
Tags: 3:0.svn20090119-1ubuntu1
https://launchpad.net/bugs/318501
https://launchpad.net/bugs/253767
* merge from debian. LP: #318501
* new version fixes CVE-2008-3230, LP: #253767

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/rtpdec.c
267
267
 * rtp demux (otherwise CODEC_ID_MPEG2TS packets are returned)
268
268
 * TODO: change this to not take rtp_payload data, and use the new dynamic payload system.
269
269
 */
270
 
RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *rtpc, int payload_type, rtp_payload_data_t *rtp_payload_data)
 
270
RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *rtpc, int payload_type, RTPPayloadData *rtp_payload_data)
271
271
{
272
272
    RTPDemuxContext *s;
273
273
 
323
323
{
324
324
    int au_headers_length, au_header_size, i;
325
325
    GetBitContext getbitcontext;
326
 
    rtp_payload_data_t *infos;
 
326
    RTPPayloadData *infos;
327
327
 
328
328
    infos = s->rtp_payload_data;
329
329
 
512
512
            if (rtp_parse_mp4_au(s, buf))
513
513
                return -1;
514
514
            {
515
 
                rtp_payload_data_t *infos = s->rtp_payload_data;
 
515
                RTPPayloadData *infos = s->rtp_payload_data;
516
516
                if (infos == NULL)
517
517
                    return -1;
518
518
                buf += infos->au_headers_length_bytes + 2;