← Back to branch summary

~ppsspp/ppsspp/ffmpeg

« back to all changes in this revision

Viewing changes to libavformat/ffmdec.c

  • Committer: Henrik Rydgård
  • Date: 2014-01-03 10:44:32 UTC
  • Revision ID: git-v1:87c6c126784b1718bfa448ecf2e6a9fef781eb4e
Update our ffmpeg snapshot to a clone of the official repository.

This is because Maxim's at3plus support has been officially merged!

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/ffmdec.c
19
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
20
 */
21
21
 
 
22
#include <stdint.h>
 
23
 
22
24
#include "libavutil/intreadwrite.h"
23
25
#include "libavutil/intfloat.h"
24
26
#include "avformat.h"
278
280
            codec->flags2 = avio_rb32(pb);
279
281
            codec->debug = avio_rb32(pb);
280
282
            if (codec->flags & CODEC_FLAG_GLOBAL_HEADER) {
281
 
                if (ff_alloc_extradata(codec, avio_rb32(pb)))
 
283
                if (ff_get_extradata(codec, pb, avio_rb32(pb)) < 0)
282
284
                    return AVERROR(ENOMEM);
283
 
                avio_read(pb, codec->extradata, codec->extradata_size);
284
285
            }
285
286
            avio_seek(pb, next, SEEK_SET);
286
287
            id = avio_rb32(pb);
466
467
            goto fail;
467
468
        }
468
469
        if (codec->flags & CODEC_FLAG_GLOBAL_HEADER) {
469
 
            if (ff_alloc_extradata(codec, avio_rb32(pb)))
 
470
            if (ff_get_extradata(codec, pb, avio_rb32(pb)) < 0)
470
471
                return AVERROR(ENOMEM);
471
 
            avio_read(pb, codec->extradata, codec->extradata_size);
472
472
        }
473
473
    }
474
474