Browse Source

avfilter/vf_scale_npp: move aspect ratio correction after av_frame_copy_props

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
tags/n3.3
Miroslav Slugeň Timo Rothenpieler 9 years ago
parent
commit
1d056dd855
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      libavfilter/vf_scale_npp.c

+ 5
- 5
libavfilter/vf_scale_npp.c View File

@@ -586,11 +586,6 @@ static int nppscale_filter_frame(AVFilterLink *link, AVFrame *in)
goto fail;
}

av_reduce(&out->sample_aspect_ratio.num, &out->sample_aspect_ratio.den,
(int64_t)in->sample_aspect_ratio.num * outlink->h * link->w,
(int64_t)in->sample_aspect_ratio.den * outlink->w * link->h,
INT_MAX);

err = device_hwctx->internal->cuda_dl->cuCtxPushCurrent(device_hwctx->cuda_ctx);
if (err != CUDA_SUCCESS) {
ret = AVERROR_UNKNOWN;
@@ -603,6 +598,11 @@ static int nppscale_filter_frame(AVFilterLink *link, AVFrame *in)
if (ret < 0)
goto fail;

av_reduce(&out->sample_aspect_ratio.num, &out->sample_aspect_ratio.den,
(int64_t)in->sample_aspect_ratio.num * outlink->h * link->w,
(int64_t)in->sample_aspect_ratio.den * outlink->w * link->h,
INT_MAX);

av_frame_free(&in);
return ff_filter_frame(outlink, out);
fail:


Loading…
Cancel
Save