diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-14 04:16:16 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-14 04:16:16 +0400 |
| commit | da2189596d9a339d2e6eb2f14137de93b15b354f (patch) | |
| tree | a11e6ed2e8f0715fc2d468aa0937ccdf2041fd8a /libavcodec/libfdk-aacenc.c | |
| parent | 1f20fa2da83922cd73b090b7f336ba51e25b1fb3 (diff) | |
| parent | 2df0c32ea12ddfa72ba88309812bfb13b674130f (diff) | |
Merge commit '2df0c32ea12ddfa72ba88309812bfb13b674130f'
* commit '2df0c32ea12ddfa72ba88309812bfb13b674130f':
lavc: use a separate field for exporting audio encoder padding
Conflicts:
libavcodec/audio_frame_queue.c
libavcodec/avcodec.h
libavcodec/libvorbisenc.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/wmaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfdk-aacenc.c')
| -rw-r--r-- | libavcodec/libfdk-aacenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index b9c9a132bd..3eadb36b83 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -286,7 +286,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) } avctx->frame_size = info.frameLength; - avctx->delay = info.encoderDelay; + avctx->initial_padding = info.encoderDelay; ff_af_queue_init(avctx, &s->afq); if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) { |