diff options
author | Philip Langdale <philipl@overt.org> | 2016-11-23 14:05:18 -0800 |
---|---|---|
committer | Philip Langdale <philipl@overt.org> | 2016-11-25 10:13:58 -0800 |
commit | 829db8effd76b579ae9aca5ee8f85d3ade6af253 (patch) | |
tree | aeb633120080b40e58ba243f06f374760568fb77 | |
parent | 50b14539158bd6d179afebb795b38be108359c4a (diff) | |
download | ffmpeg-829db8effd76b579ae9aca5ee8f85d3ade6af253.tar.gz |
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.
-rw-r--r-- | libavcodec/nvenc.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index cd14af2852..d24d2780e5 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -953,18 +953,6 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx) 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.frameRateDen = avctx->time_base.num * avctx->ticks_per_frame; |