diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-14 02:16:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-14 02:16:16 +0200 |
| commit | da2189596d9a339d2e6eb2f14137de93b15b354f (patch) | |
| tree | a11e6ed2e8f0715fc2d468aa0937ccdf2041fd8a /libavcodec/libfaac.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/libfaac.c')
| -rw-r--r-- | libavcodec/libfaac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c index 477669a812..69c186b11a 100644 --- a/libavcodec/libfaac.c +++ b/libavcodec/libfaac.c @@ -167,7 +167,7 @@ static av_cold int Faac_encode_init(AVCodecContext *avctx) } } - avctx->delay = FAAC_DELAY_SAMPLES; + avctx->initial_padding = FAAC_DELAY_SAMPLES; ff_af_queue_init(avctx, &s->afq); return 0; |