videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avfilter/vf_xfade_opencl: move passthrough code before eof check

This commit is contained in:
Paul B Mahol 2020-02-03 09:40:46 +01:00
parent 6d5e9ed67c
commit c4e29d0ba3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/vf_xfade_opencl.c
View File

@ -270,6 +270,9 @@ static int xfade_opencl_activate(AVFilterContext *avctx)
ret = ff_inlink_consume_frame(avctx->inputs[1], &in);
if (ret < 0) {
return ret;
} else if (ret > 0) {
in->pts = (in->pts - ctx->last_pts) + ctx->pts;
return ff_filter_frame(outlink, in);
} else if (ff_inlink_acknowledge_status(avctx->inputs[1], &status, &pts)) {
ff_outlink_set_status(outlink, status, ctx->pts);
return 0;
@ -278,9 +281,6 @@ static int xfade_opencl_activate(AVFilterContext *avctx)
ff_inlink_request_frame(avctx->inputs[1]);
return 0;
}
} else {
in->pts = (in->pts - ctx->last_pts) + ctx->pts;
return ff_filter_frame(outlink, in);
}
}