diff options
| author | Anton Khirnov <anton@khirnov.net> | 2023-07-14 18:20:03 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2023-07-20 20:47:46 +0200 |
| commit | 83ace80bfd80fcdba2c65fa1d554923ea931d5bd (patch) | |
| tree | cbf8ea54c9aeb1681f9022099fd645bc9ba5759d /fftools | |
| parent | 2f155b18a10fec84163b3546efb41a8d64bb7c22 (diff) | |
| download | ffmpeg-83ace80bfd80fcdba2c65fa1d554923ea931d5bd.tar.gz | |
fftools/ffmpeg: return an error from MATCH_PER_STREAM_OPT() instead of aborting
Diffstat (limited to 'fftools')
| -rw-r--r-- | fftools/ffmpeg.h | 2 |
1 files changed, 1 insertions, 1 deletions
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);\ |