mirror of https://git.ffmpeg.org/ffmpeg.git
avformat/utils: return pending IO error on EOF in av_read_frame()
avio_feof() returns true both in case of actual EOF and in case of IO errors. Some demuxers (matroska) have special handling to be able to return the proper error for this exact reason, e.g.: if (avio_feof(pb)) { if (pb->error) { return pb->error; } else { return AVERROR_EOF; } } However, most of the demuxers do not, and they simply return AVERROR_EOF if avio_feof() is true, so there is a real chance that IO errors are mistaken for EOF. We might just say that the API user should always check the IO context error attribute on EOF to make sure no IO errors happened, but not even ffmpeg.c does this. It should be more intuitive to the API user if we simply return the IO error as the return value of av_read_frame() instead of AVERROR_EOF. Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
parent
2e31774b40
commit
ce1fcc8ced
|
@ -1762,6 +1762,11 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
|||
av_ts2str(pkt->dts),
|
||||
pkt->size, pkt->duration, pkt->flags);
|
||||
|
||||
/* A demuxer might have returned EOF because of an IO error, let's
|
||||
* propagate this back to the user. */
|
||||
if (ret == AVERROR_EOF && s->pb && s->pb->error < 0 && s->pb->error != AVERROR(EAGAIN))
|
||||
ret = s->pb->error;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue