diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-18 14:39:15 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-18 14:39:15 +0100 |
| commit | 362028cac913e232ce8c3702fa4c96b33fc5e0de (patch) | |
| tree | 9ddb25aabdab4278d23fb61c72735f4250ea588f /libavcodec/aacenc.c | |
| parent | 2630f7f709049113dc03d6b999efad6acc423d67 (diff) | |
| parent | 16216b713f9a21865cc07993961cf5d0ece24916 (diff) | |
| download | ffmpeg-362028cac913e232ce8c3702fa4c96b33fc5e0de.tar.gz | |
Merge commit '16216b713f9a21865cc07993961cf5d0ece24916'
* commit '16216b713f9a21865cc07993961cf5d0ece24916':
lavc: Drop exporting 2-pass encoding stats
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/aacenc.c')
| -rw-r--r-- | libavcodec/aacenc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index ec09063e84..3b7dc164da 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -818,7 +818,13 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, put_bits(&s->pb, 3, TYPE_END); flush_put_bits(&s->pb); + +#if FF_API_STAT_BITS +FF_DISABLE_DEPRECATION_WARNINGS avctx->frame_bits = put_bits_count(&s->pb); +FF_ENABLE_DEPRECATION_WARNINGS +#endif + s->lambda_sum += s->lambda; s->lambda_count++; |