aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-21 03:02:06 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-23 18:17:42 +0200
commit5691d9a6c1290597b7c66f26da060c2f94fafee7 (patch)
tree85cb6270acfc4a0abca3ec3b1f05d2891ff3320b
parent2b8490b762d97fa4024c6e5dc169ff31e2c4db30 (diff)
downloadffmpeg-5691d9a6c1290597b7c66f26da060c2f94fafee7.tar.gz
avcodec/libvorbisenc: dont add the duration to AV_NOPTS_VALUE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 19e66c7232d96e4ae8f05b52da2b84dfaa4e4da3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/libvorbisenc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c
index 1c0dab65e9..21cc4415fb 100644
--- a/libavcodec/libvorbisenc.c
+++ b/libavcodec/libvorbisenc.c
@@ -362,7 +362,8 @@ static int oggvorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
avctx->delay = duration;
av_assert0(!s->afq.remaining_delay);
s->afq.frames->duration += duration;
- s->afq.frames->pts -= duration;
+ if (s->afq.frames->pts != AV_NOPTS_VALUE)
+ s->afq.frames->pts -= duration;
s->afq.remaining_samples += duration;
}
ff_af_queue_remove(&s->afq, duration, &avpkt->pts, &avpkt->duration);