1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Anton Khirnov 159270e3b2 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
(cherry picked from commit d1fa39d08d3bce9c268cd02cb3c45a76e63b6ff4)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2024-07-24 08:26:13 +02:00
..
2022-07-23 11:53:19 +02:00