Browse Source

avfilter/zscale: fix segfault on library error

tags/n4.0
dxfhgwet Paul B Mahol 8 years ago
parent
commit
b43d13144b
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      libavfilter/vf_zscale.c

+ 3
- 3
libavfilter/vf_zscale.c View File

@@ -321,7 +321,7 @@ static int print_zimg_error(AVFilterContext *ctx)


av_log(ctx, AV_LOG_ERROR, "code %d: %s\n", err_code, err_msg); av_log(ctx, AV_LOG_ERROR, "code %d: %s\n", err_code, err_msg);


return err_code;
return AVERROR_EXTERNAL;
} }


static int convert_chroma_location(enum AVChromaLocation chroma_location) static int convert_chroma_location(enum AVChromaLocation chroma_location)
@@ -624,7 +624,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)


ret = zimg_filter_graph_process(s->graph, &src_buf, &dst_buf, s->tmp, 0, 0, 0, 0); ret = zimg_filter_graph_process(s->graph, &src_buf, &dst_buf, s->tmp, 0, 0, 0, 0);
if (ret) { if (ret) {
print_zimg_error(link->dst);
ret = print_zimg_error(link->dst);
goto fail; goto fail;
} }


@@ -639,7 +639,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)


ret = zimg_filter_graph_process(s->alpha_graph, &src_buf, &dst_buf, s->tmp, 0, 0, 0, 0); ret = zimg_filter_graph_process(s->alpha_graph, &src_buf, &dst_buf, s->tmp, 0, 0, 0, 0);
if (ret) { if (ret) {
print_zimg_error(link->dst);
ret = print_zimg_error(link->dst);
goto fail; goto fail;
} }
} else if (odesc->flags & AV_PIX_FMT_FLAG_ALPHA) { } else if (odesc->flags & AV_PIX_FMT_FLAG_ALPHA) {


Loading…
Cancel
Save