fftools/ffmpeg: return an error from MATCH_PER_STREAM_OPT() instead of aborting

83ace80b · Anton Khirnov · 2f155b18 · 83ace80b
Commit 83ace80b authored Jul 14, 2023 by Anton Khirnov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ffmpeg.h fftools/ffmpeg.h +1 -1

No files found.
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -911,7 +911,7 @@ static inline int err_merge(int err0, int err1)
            so = &o->name[_i];\
            _matches++;\
        } else if (_ret < 0)\
-            exit_program(1);\
+            return _ret;\
    }\
    if (_matches > 1)\
       WARN_MULTIPLE_OPT_USAGE(name, type, so, st);\