← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic

« back to all changes in this revision

Viewing changes to libavformat/cafdec.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2014-09-13 15:36:38 UTC
  • mfrom: (1.3.49 sid)
  • Revision ID: package-import@ubuntu.com-20140913153638-6rfush77baz008o9
Tags: 6:11-1
http://bugs.debian.org/757185
* Upload final 11 release
  - matroskadec: parse stereo mode on decoding (Closes: #757185)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/cafdec.c
109
109
           The lavc AAC decoder requires the data from the codec specific
110
110
           description as extradata input. */
111
111
        int strt, skip;
112
 
        MOVAtom atom;
113
112
 
114
113
        strt = avio_tell(pb);
115
 
        ff_mov_read_esds(s, pb, atom);
 
114
        ff_mov_read_esds(s, pb);
116
115
        skip = size - (avio_tell(pb) - strt);
117
116
        if (skip < 0 || !st->codec->extradata ||
118
117
            st->codec->codec_id != AV_CODEC_ID_AAC) {