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/libvorbisenc.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/libvorbisenc.c')
| -rw-r--r-- | libavcodec/libvorbisenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index ed6baa90d3..96af53614b 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -345,8 +345,8 @@ static int libvorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (duration > 0) { /* we do not know encoder delay until we get the first packet from * libvorbis, so we have to update the AudioFrameQueue counts */ - if (!avctx->delay && s->afq.frames) { - avctx->delay = duration; + if (!avctx->initial_padding && s->afq.frames) { + avctx->initial_padding = duration; av_assert0(!s->afq.remaining_delay); s->afq.frames->duration += duration; if (s->afq.frames->pts != AV_NOPTS_VALUE) |