[FFmpeg-cvslog] fftools/ffmpeg: return an error from MATCH_PER_STREAM_OPT() instead of aborting

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri Jul 14 18:20:03 2023 +0200| [83ace80bfd80fcdba2c65fa1d554923ea931d5bd] | committer: Anton Khirnov

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83ace80bfd80fcdba2c65fa1d554923ea931d5bd
---

 fftools/ffmpeg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 82439dc5e3..d53181e427 100644
--- 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);\