repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavcodec
/
libfdk-aacenc.c
diff --git
a/ffmpeg/libavcodec/libfdk-aacenc.c
b/ffmpeg/libavcodec/libfdk-aacenc.c
index b9c9a132bd0d3cb1df645209e774267294803b01..3eadb36b837996d4fa0376bb0a587ee22dde3222 100644
(file)
--- a/
ffmpeg/libavcodec/libfdk-aacenc.c
+++ b/
ffmpeg/libavcodec/libfdk-aacenc.c
@@
-286,7
+286,7
@@
static av_cold int aac_encode_init(AVCodecContext *avctx)
}
avctx->frame_size = info.frameLength;
- avctx->
delay
= info.encoderDelay;
+ avctx->
initial_padding
= info.encoderDelay;
ff_af_queue_init(avctx, &s->afq);
if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) {