diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-25 21:35:15 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-25 21:37:05 -0300 |
| commit | f5c8d004c28d930d780c9164f7ed6005b88b9be5 (patch) | |
| tree | 5b7bb3096f4aa58c8ecd710b5dc59e7d1c2259ca /libavcodec/aacpsy.c | |
| parent | 2f05d18ee2c74e4c3619bf2ef6a64f686519f3c7 (diff) | |
| download | ffmpeg-streaming-f5c8d004c28d930d780c9164f7ed6005b88b9be5.zip ffmpeg-streaming-f5c8d004c28d930d780c9164f7ed6005b88b9be5.tar.gz | |
avcodec: stop using deprecated codec flags
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/aacpsy.c')
| -rw-r--r-- | libavcodec/aacpsy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index a5fec73..e32faaa 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -303,7 +303,7 @@ static av_cold int psy_3gpp_init(FFPsyContext *ctx) { float bark; int i, j, g, start; float prev, minscale, minath, minsnr, pe_min; - int chan_bitrate = ctx->avctx->bit_rate / ((ctx->avctx->flags & CODEC_FLAG_QSCALE) ? 2.0f : ctx->avctx->channels); + int chan_bitrate = ctx->avctx->bit_rate / ((ctx->avctx->flags & AV_CODEC_FLAG_QSCALE) ? 2.0f : ctx->avctx->channels); const int bandwidth = ctx->cutoff ? ctx->cutoff : AAC_CUTOFF(ctx->avctx); const float num_bark = calc_bark((float)bandwidth); @@ -314,7 +314,7 @@ static av_cold int psy_3gpp_init(FFPsyContext *ctx) { pctx = (AacPsyContext*) ctx->model_priv_data; pctx->global_quality = (ctx->avctx->global_quality ? ctx->avctx->global_quality : 120) * 0.01f; - if (ctx->avctx->flags & CODEC_FLAG_QSCALE) { + if (ctx->avctx->flags & AV_CODEC_FLAG_QSCALE) { /* Use the target average bitrate to compute spread parameters */ chan_bitrate = (int)(chan_bitrate / 120.0 * (ctx->avctx->global_quality ? ctx->avctx->global_quality : 120)); } @@ -704,7 +704,7 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel, /* 5.6.1.3.2 "Calculation of the desired perceptual entropy" */ ctx->ch[channel].entropy = pe; - if (ctx->avctx->flags & CODEC_FLAG_QSCALE) { + if (ctx->avctx->flags & AV_CODEC_FLAG_QSCALE) { /* (2.5 * 120) achieves almost transparent rate, and we want to give * ample room downwards, so we make that equivalent to QSCALE=2.4 */ |
