mirror of https://git.ffmpeg.org/ffmpeg.git
fftools/ffmpeg: return an error from MATCH_PER_STREAM_OPT() instead of aborting
This commit is contained in:
parent
2f155b18a1
commit
83ace80bfd
|
@ -911,7 +911,7 @@ static inline int err_merge(int err0, int err1)
|
||||||
so = &o->name[_i];\
|
so = &o->name[_i];\
|
||||||
_matches++;\
|
_matches++;\
|
||||||
} else if (_ret < 0)\
|
} else if (_ret < 0)\
|
||||||
exit_program(1);\
|
return _ret;\
|
||||||
}\
|
}\
|
||||||
if (_matches > 1)\
|
if (_matches > 1)\
|
||||||
WARN_MULTIPLE_OPT_USAGE(name, type, so, st);\
|
WARN_MULTIPLE_OPT_USAGE(name, type, so, st);\
|
||||||
|
|
Loading…
Reference in New Issue