st->codecpar->bits_per_coded_sample;
ea->audio_stream_index = st->index;
st->start_time = 0;
- return 1;
+ return 0;
}
no_audio:
ea->audio_codec = AV_CODEC_ID_NONE;
if (!ea->video.codec)
return AVERROR_INVALIDDATA;
- return 1;
+ return 0;
}
static int ea_read_packet(AVFormatContext *s, AVPacket *pkt)
int av_uninit(num_samples);
while ((!packet_read && !hit_end) || partial_packet) {
+ if (avio_feof(pb))
+ return AVERROR_EOF;
chunk_type = avio_rl32(pb);
chunk_size = ea->big_endian ? avio_rb32(pb) : avio_rl32(pb);
if (chunk_size < 8)
break;
} else if (ea->audio_codec == AV_CODEC_ID_PCM_S16LE_PLANAR ||
ea->audio_codec == AV_CODEC_ID_MP3) {
+ if (chunk_size < 12)
+ return AVERROR_INVALIDDATA;
num_samples = avio_rl32(pb);
avio_skip(pb, 8);
chunk_size -= 12;
} else if (ea->audio_codec == AV_CODEC_ID_ADPCM_PSX) {
+ if (chunk_size < 8)
+ return AVERROR_INVALIDDATA;
avio_skip(pb, 8);
chunk_size -= 8;
}
case fVGT_TAG:
case MADm_TAG:
case MADe_TAG:
+ if (chunk_size > INT_MAX - 8)
+ return AVERROR_INVALIDDATA;
avio_seek(pb, -8, SEEK_CUR); // include chunk preamble
chunk_size += 8;
goto get_video_packet;
ret = av_get_packet(pb, pkt, chunk_size);
if (ret < 0) {
packet_read = 1;
+ partial_packet = 0;
break;
}
partial_packet = chunk_type == MVIh_TAG;
return ret;
}
-AVInputFormat ff_ea_demuxer = {
+const AVInputFormat ff_ea_demuxer = {
.name = "ea",
.long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia"),
.priv_data_size = sizeof(EaDemuxContext),