ffmpeg | branch: master | Anton Khirnov <an...@khirnov.net> | Tue Jul 23 15:11:08 2024 +0200| [d1fa39d08d3bce9c268cd02cb3c45a76e63b6ff4] | committer: Anton Khirnov
fftools/ffmpeg: prefer real errors over EOF in err_merge() Fixes an issue in 6.1 when reading a corrupted file with -xerror would exit with success. This specific issue is not present in master, but this should generally be a more robust behaviour. Reported-by: Andrej Peterka > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1fa39d08d3bce9c268cd02cb3c45a76e63b6ff4 --- fftools/ffmpeg_utils.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg_utils.h b/fftools/ffmpeg_utils.h index bd225abc38..7939e44cdc 100644 --- a/fftools/ffmpeg_utils.h +++ b/fftools/ffmpeg_utils.h @@ -35,11 +35,12 @@ typedef struct Timestamp { /** * Merge two return codes - return one of the error codes if at least one of * them was negative, 0 otherwise. - * Currently just picks the first one, eventually we might want to do something - * more sophisticated, like sorting them by priority. */ static inline int err_merge(int err0, int err1) { + // prefer "real" errors over EOF + if ((err0 >= 0 || err0 == AVERROR_EOF) && err1 < 0) + return err1; return (err0 < 0) ? err0 : FFMIN(err1, 0); } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
