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/ac3enc.c | |
| parent | 1f20fa2da83922cd73b090b7f336ba51e25b1fb3 (diff) | |
| parent | 2df0c32ea12ddfa72ba88309812bfb13b674130f (diff) | |
| download | ffmpeg-da2189596d9a339d2e6eb2f14137de93b15b354f.tar.gz | |
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/ac3enc.c')
| -rw-r--r-- | libavcodec/ac3enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index ce5cde8326..8fc9952e66 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -2434,7 +2434,7 @@ av_cold int ff_ac3_encode_init(AVCodecContext *avctx) return ret; avctx->frame_size = AC3_BLOCK_SIZE * s->num_blocks; - avctx->delay = AC3_BLOCK_SIZE; + avctx->initial_padding = AC3_BLOCK_SIZE; s->bitstream_mode = avctx->audio_service_type; if (s->bitstream_mode == AV_AUDIO_SERVICE_TYPE_KARAOKE) |