On date Saturday 2023-07-15 12:46:09 +0200, Anton Khirnov wrote:
> There is no reason to keep them separate.
>
> Also, replace exit_program() with returning an error code.
> ---
> fftools/ffprobe.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
> index 6180a5c952..e234c92904 100644
> --- a/fftools/ffprobe.c
> +++ b/fftools/ffprobe.c
> @@ -3795,22 +3795,18 @@ static int opt_input_file_i(void *optctx, const char
> *opt, const char *arg)
> return 0;
> }
>
> -static void opt_output_file(void *optctx, const char *arg)
> +static int opt_output_file_o(void *optctx, const char *opt, const char *arg)
> {
> if (output_filename) {
> av_log(NULL, AV_LOG_ERROR,
> "Argument '%s' provided as output filename, but '%s' was
> already specified.\n",
> arg, output_filename);
> - exit_program(1);
> + return AVERROR(EINVAL);
> }
> if (!strcmp(arg, "-"))
> arg = "fd:";
> output_filename = arg;
> -}
>
> -static int opt_output_file_o(void *optctx, const char *opt, const char *arg)
> -{
> - opt_output_file(optctx, arg);
> return 0;
> }
>
LGTM.
_______________________________________________
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".
