← Back to branch summary

~ppsspp/ppsspp/ffmpeg

« back to all changes in this revision

Viewing changes to libavformat/apetag.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/apetag.c
88
88
            st->attached_pic.stream_index = st->index;
89
89
            st->attached_pic.flags       |= AV_PKT_FLAG_KEY;
90
90
        } else {
91
 
            if (ff_alloc_extradata(st->codec, size))
 
91
            if (ff_get_extradata(st->codec, s->pb, size) < 0)
92
92
                return AVERROR(ENOMEM);
93
 
            if (avio_read(pb, st->codec->extradata, size) != size) {
94
 
                av_freep(&st->codec->extradata);
95
 
                st->codec->extradata_size = 0;
96
 
                return AVERROR(EIO);
97
 
            }
98
93
            st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT;
99
94
        }
100
95
    } else {