diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 17:06:05 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 17:08:32 -0300 |
| commit | bfab4308560c277d754c214210758a865fcc7348 (patch) | |
| tree | 609493b886bed4b8a94bf89a6b8cad269224fb3b /libavcodec/dnxhdenc.c | |
| parent | fb41bad7e051240017bc4cc79c50ea36ac12b96c (diff) | |
| parent | 94eed68ace9f2416af8457fcbf142b175928c06b (diff) | |
| download | ffmpeg-bfab4308560c277d754c214210758a865fcc7348.tar.gz | |
Merge commit '94eed68ace9f2416af8457fcbf142b175928c06b'
* commit '94eed68ace9f2416af8457fcbf142b175928c06b':
lavc: Drop deprecated options moved to private contexts
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/dnxhdenc.c')
| -rw-r--r-- | libavcodec/dnxhdenc.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 0d80381a2d..86e71ca8b0 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -490,12 +490,6 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) else ctx->data_offset = 0x280; -#if FF_API_QUANT_BIAS -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS) - ctx->intra_quant_bias = avctx->intra_quant_bias; -FF_ENABLE_DEPRECATION_WARNINGS -#endif // XXX tune lbias/cbias if ((ret = dnxhd_init_qmat(ctx, ctx->intra_quant_bias, 0)) < 0) return ret; |