highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg_filter: replace remaining exit_program() with error codes

Browse Source
This commit is contained in:
Anton Khirnov
2023-07-13 15:11:07 +02:00
parent a52ee1aa47
commit 8815adfe75
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/ffmpeg.h
View File

@@ -716,7 +716,7 @@ const AVCodec *find_codec_or_die(void *logctx, const char *name,
enum AVMediaType type, int encoder); enum AVMediaType type, int encoder);
int parse_and_set_vsync(const char *arg, int *vsync_var, int file_idx, int st_idx, int is_global); int parse_and_set_vsync(const char *arg, int *vsync_var, int file_idx, int st_idx, int is_global);
void check_filter_outputs(void); int check_filter_outputs(void);
int filtergraph_is_simple(const FilterGraph *fg); int filtergraph_is_simple(const FilterGraph *fg);
int init_simple_filtergraph(InputStream *ist, OutputStream *ost, int init_simple_filtergraph(InputStream *ist, OutputStream *ost,
char *graph_desc); char *graph_desc);

17
fftools/ffmpeg_filter.c
View File

@@ -1246,7 +1246,7 @@ static int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter,
{ {
if (!ofilter->ost) { if (!ofilter->ost) {
av_log(fg, AV_LOG_FATAL, "Filter %s has an unconnected output\n", ofilter->name); av_log(fg, AV_LOG_FATAL, "Filter %s has an unconnected output\n", ofilter->name);
exit_program(1); return AVERROR(EINVAL);
} }
switch (avfilter_pad_get_type(out->filter_ctx->output_pads, out->pad_idx)) { switch (avfilter_pad_get_type(out->filter_ctx->output_pads, out->pad_idx)) {
@@ -1256,7 +1256,7 @@ static int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter,
} }
} }
void check_filter_outputs(void) int check_filter_outputs(void)
{ {
int i; int i;
for (i = 0; i < nb_filtergraphs; i++) { for (i = 0; i < nb_filtergraphs; i++) {
@@ -1266,10 +1266,12 @@ void check_filter_outputs(void)
if (!output->ost) { if (!output->ost) {
av_log(filtergraphs[i], AV_LOG_FATAL, av_log(filtergraphs[i], AV_LOG_FATAL,
"Filter %s has an unconnected output\n", output->name); "Filter %s has an unconnected output\n", output->name);
exit_program(1); return AVERROR(EINVAL);
} }
} }
} }
return 0;
} }
static void sub2video_prepare(InputFilterPriv *ifp) static void sub2video_prepare(InputFilterPriv *ifp)
@@ -1570,8 +1572,13 @@ static int configure_filtergraph(FilterGraph *fg)
} }
avfilter_inout_free(&inputs); avfilter_inout_free(&inputs);
for (cur = outputs, i = 0; cur; cur = cur->next, i++) for (cur = outputs, i = 0; cur; cur = cur->next, i++) {
configure_output_filter(fg, fg->outputs[i], cur); ret = configure_output_filter(fg, fg->outputs[i], cur);
if (ret < 0) {
avfilter_inout_free(&outputs);
goto fail;
}
}
avfilter_inout_free(&outputs); avfilter_inout_free(&outputs);
if (fgp->disable_conversions) if (fgp->disable_conversions)

4
fftools/ffmpeg_opt.c
View File

@@ -1301,7 +1301,9 @@ int ffmpeg_parse_options(int argc, char **argv)
apply_sync_offsets(); apply_sync_offsets();
check_filter_outputs(); ret = check_filter_outputs();
if (ret < 0)
goto fail;
fail: fail:
uninit_parse_context(&octx); uninit_parse_context(&octx);