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
/
libvo-amrwbenc.c
diff --git
a/ffmpeg/libavcodec/libvo-amrwbenc.c
b/ffmpeg/libavcodec/libvo-amrwbenc.c
index f14d61fecf41bcf793eedd6e03bb30795f7bf446..fe19e71156d9621d668aac462ffee4b1d690e50a 100644
(file)
--- a/
ffmpeg/libavcodec/libvo-amrwbenc.c
+++ b/
ffmpeg/libavcodec/libvo-amrwbenc.c
@@
-93,7
+93,7
@@
static av_cold int amr_wb_encode_init(AVCodecContext *avctx)
s->last_bitrate = avctx->bit_rate;
avctx->frame_size = 320;
s->last_bitrate = avctx->bit_rate;
avctx->frame_size = 320;
- avctx->
delay
= 80;
+ avctx->
initial_padding
= 80;
s->state = E_IF_init();
s->state = E_IF_init();
@@
-129,7
+129,7
@@
static int amr_wb_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
}
if (frame->pts != AV_NOPTS_VALUE)
}
if (frame->pts != AV_NOPTS_VALUE)
- avpkt->pts = frame->pts - ff_samples_to_time_base(avctx, avctx->
delay
);
+ avpkt->pts = frame->pts - ff_samples_to_time_base(avctx, avctx->
initial_padding
);
avpkt->size = size;
*got_packet_ptr = 1;
avpkt->size = size;
*got_packet_ptr = 1;