diff mbox series

[FFmpeg-devel,41/47] fftools/ffmpeg: return an error from MATCH_PER_STREAM_OPT() instead of aborting

Message ID 20230715104611.17902-41-anton@khirnov.net
State Accepted
Commit 83ace80bfd80fcdba2c65fa1d554923ea931d5bd
Headers show
Series [FFmpeg-devel,01/47] fftools/ffmpeg_mux_init: handle pixel format endianness | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Anton Khirnov July 15, 2023, 10:46 a.m. UTC 
---
 fftools/ffmpeg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

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);\