---
fftools/ffmpeg.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 73baad238c..5c93b3aa29 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -912,7 +912,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);\
--
2.40.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
