diff options
| author | Miroslav Slugeň <thunder.m@email.cz> | 2016-11-27 01:09:05 +0100 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2016-11-30 12:36:23 +0100 |
| commit | 1d056dd855e408a0c7debf1d0e9fe09b0a439cea (patch) | |
| tree | f4793a0ee216809a10ee657504964d7d751001bf /libavfilter | |
| parent | f2dd6aee80c5dde338720520f99cddbdbd68fb35 (diff) | |
| download | ffmpeg-1d056dd855e408a0c7debf1d0e9fe09b0a439cea.tar.gz | |
avfilter/vf_scale_npp: move aspect ratio correction after av_frame_copy_props
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_scale_npp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/vf_scale_npp.c b/libavfilter/vf_scale_npp.c index 78f541e9fe..3c1d1e9021 100644 --- a/libavfilter/vf_scale_npp.c +++ b/libavfilter/vf_scale_npp.c @@ -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: |