return 1;
}
-static int ea_probe(AVProbeData *p)
+static int ea_probe(const AVProbeData *p)
{
unsigned big_endian, size;
EaDemuxContext *ea = s->priv_data;
AVIOContext *pb = s->pb;
int partial_packet = 0;
+ int hit_end = 0;
unsigned int chunk_type, chunk_size;
int ret = 0, packet_read = 0, key = 0;
int av_uninit(num_samples);
- while (!packet_read || partial_packet) {
+ while ((!packet_read && !hit_end) || partial_packet) {
chunk_type = avio_rl32(pb);
chunk_size = ea->big_endian ? avio_rb32(pb) : avio_rl32(pb);
if (chunk_size < 8)
case AV_CODEC_ID_ADPCM_EA_R3:
if (pkt->size < 4) {
av_log(s, AV_LOG_ERROR, "Packet is too short\n");
- av_packet_unref(pkt);
return AVERROR_INVALIDDATA;
}
if (ea->audio_codec == AV_CODEC_ID_ADPCM_EA_R3)
}
if (avio_feof(pb))
ret = AVERROR_EOF;
- packet_read = 1;
+ hit_end = 1;
break;
case MVIh_TAG:
}
}
- if (ret < 0 && partial_packet)
- av_packet_unref(pkt);
+ if (ret >= 0 && hit_end && !packet_read)
+ return AVERROR(EAGAIN);
+
return ret;
}