Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -270,6 +270,9 @@ static int xfade_opencl_activate(AVFilterContext *avctx) · 269 unmodified lines | |||
| 270 | ret = ff_inlink_consume_frame(avctx->inputs[1], &in); | 270 | ret = ff_inlink_consume_frame(avctx->inputs[1], &in); |
| 271 | if (ret < 0) { | 271 | if (ret < 0) { |
| 272 | return ret; | 272 | return ret; |
| 273 | } else if (ret > 0) { | ||
| 274 | in->pts = (in->pts - ctx->last_pts) + ctx->pts; | ||
| 275 | return ff_filter_frame(outlink, in); | ||
| 273 | } else if (ff_inlink_acknowledge_status(avctx->inputs[1], &status, &pts)) { | 276 | } else if (ff_inlink_acknowledge_status(avctx->inputs[1], &status, &pts)) { |
| 274 | ff_outlink_set_status(outlink, status, ctx->pts); | 277 | ff_outlink_set_status(outlink, status, ctx->pts); |
| 275 | return 0; | 278 | return 0; |
| @@ -278,9 +281,6 @@ static int xfade_opencl_activate(AVFilterContext *avctx) · 2 unmodified lines | |||
| 278 | ff_inlink_request_frame(avctx->inputs[1]); | 281 | ff_inlink_request_frame(avctx->inputs[1]); |
| 279 | return 0; | 282 | return 0; |
| 280 | } | 283 | } |
| 281 | } else { | ||
| 282 | in->pts = (in->pts - ctx->last_pts) + ctx->pts; | ||
| 283 | return ff_filter_frame(outlink, in); | ||
| 284 | } | 284 | } |
| 285 | } | 285 | } |
| 286 | 286 | ||