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
/
audio_frame_queue.c
diff --git
a/ffmpeg/libavcodec/audio_frame_queue.c
b/ffmpeg/libavcodec/audio_frame_queue.c
index 12203450ba7234b9bbd8d73ec61935ac0082c8ea..4f6bccce367dce771ad422677bc8019294e434b1 100644
(file)
--- a/
ffmpeg/libavcodec/audio_frame_queue.c
+++ b/
ffmpeg/libavcodec/audio_frame_queue.c
@@
-28,8
+28,8
@@
av_cold void ff_af_queue_init(AVCodecContext *avctx, AudioFrameQueue *afq)
{
afq->avctx = avctx;
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;
}
afq->frame_count = 0;
}