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/ra144enc.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/ra144enc.c')
-rw-r--r-- | libavcodec/ra144enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 499c41a038..3ad3f4ea96 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -55,7 +55,7 @@ static av_cold int ra144_encode_init(AVCodecContext * avctx) return -1; } avctx->frame_size = NBLOCKS * BLOCKSIZE; - avctx->delay = avctx->frame_size; + avctx->initial_padding = avctx->frame_size; avctx->bit_rate = 8000; ractx = avctx->priv_data; ractx->lpc_coef[0] = ractx->lpc_tables[0]; |