← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ffmpeg-debian/utopic

« back to all changes in this revision

Viewing changes to libavformat/ipmovie.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/ipmovie.c
32
32
 * up and sending out the chunks.
33
33
 */
34
34
 
 
35
#include "libavutil/intreadwrite.h"
35
36
#include "avformat.h"
36
37
 
37
38
/* debugging support: #define DEBUG_IPMOVIE as non-zero to see extremely
101
102
    unsigned int audio_bits;
102
103
    unsigned int audio_channels;
103
104
    unsigned int audio_sample_rate;
104
 
    unsigned int audio_type;
 
105
    enum CodecID audio_type;
105
106
    unsigned int audio_frame_count;
106
107
 
107
108
    int video_stream_index;
544
545
    url_fseek(pb, -CHUNK_PREAMBLE_SIZE, SEEK_CUR);
545
546
 
546
547
    if (chunk_type == CHUNK_VIDEO)
547
 
        ipmovie->audio_type = 0;  /* no audio */
 
548
        ipmovie->audio_type = CODEC_ID_NONE;  /* no audio */
548
549
    else if (process_ipmovie_chunk(ipmovie, pb, &pkt) != CHUNK_INIT_AUDIO)
549
550
        return AVERROR_INVALIDDATA;
550
551