Commit 829db8ef authored by Philip Langdale's avatar Philip Langdale

avcodec/nvenc: Remove aspect-ratio decompensation logic

This dubious behaviour in nvenc was finally removed by nvidia, and
as we refuse to run on anything older than 7.0, we don't need to
keep it around for old versions.
parent 50b14539
...@@ -953,18 +953,6 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx) ...@@ -953,18 +953,6 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx)
ctx->init_encode_params.darWidth = avctx->width; ctx->init_encode_params.darWidth = avctx->width;
} }
// De-compensate for hardware, dubiously, trying to compensate for
// playback at 704 pixel width.
if (avctx->width == 720 &&
(avctx->height == 480 || avctx->height == 576)) {
av_reduce(&dw, &dh,
ctx->init_encode_params.darWidth * 44,
ctx->init_encode_params.darHeight * 45,
1024 * 1024);
ctx->init_encode_params.darHeight = dh;
ctx->init_encode_params.darWidth = dw;
}
ctx->init_encode_params.frameRateNum = avctx->time_base.den; ctx->init_encode_params.frameRateNum = avctx->time_base.den;
ctx->init_encode_params.frameRateDen = avctx->time_base.num * avctx->ticks_per_frame; ctx->init_encode_params.frameRateDen = avctx->time_base.num * avctx->ticks_per_frame;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment