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
/
libtwolame.c
diff --git
a/ffmpeg/libavcodec/libtwolame.c
b/ffmpeg/libavcodec/libtwolame.c
index e26454bb8441a30c5ca20c6dd58fbdacc443f6a8..dc188575b564da162b8191975a33950e63538f45 100644
(file)
--- a/
ffmpeg/libavcodec/libtwolame.c
+++ b/
ffmpeg/libavcodec/libtwolame.c
@@
-60,7
+60,7
@@
static av_cold int twolame_encode_init(AVCodecContext *avctx)
int ret;
avctx->frame_size = TWOLAME_SAMPLES_PER_FRAME;
int ret;
avctx->frame_size = TWOLAME_SAMPLES_PER_FRAME;
- avctx->
delay
= 512 - 32 + 1;
+ avctx->
initial_padding
= 512 - 32 + 1;
s->glopts = twolame_init();
if (!s->glopts)
s->glopts = twolame_init();
if (!s->glopts)
@@
-152,10
+152,10
@@
static int twolame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
if (ret < 0) // twolame error
return AVERROR_UNKNOWN;
if (ret < 0) // twolame error
return AVERROR_UNKNOWN;
- avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples);
if (frame) {
if (frame) {
+ avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples);
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
);
} else {
avpkt->pts = s->next_pts;
}
} else {
avpkt->pts = s->next_pts;
}