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/audio_frame_queue.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/audio_frame_queue.c')
| -rw-r--r-- | libavcodec/audio_frame_queue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/audio_frame_queue.c b/libavcodec/audio_frame_queue.c index 12203450ba..4f6bccce36 100644 --- a/libavcodec/audio_frame_queue.c +++ b/libavcodec/audio_frame_queue.c @@ -28,8 +28,8 @@ av_cold void ff_af_queue_init(AVCodecContext *avctx, AudioFrameQueue *afq) { afq->avctx = avctx; - afq->remaining_delay = avctx->delay; - afq->remaining_samples = avctx->delay; + afq->remaining_delay = avctx->initial_padding; + afq->remaining_samples = avctx->initial_padding; afq->frame_count = 0; } |