From cf96cce728fdc83a6ebf98997ebf90c3c2ec2052 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Wed, 2 Feb 2011 21:54:14 +0100 Subject: [PATCH] Set pkt_pts in avcodec_default_reget_buffer() This was missed when pkt_pts was first added. Signed-off-by: Nicolas George Signed-off-by: Mans Rullgard (cherry picked from commit 62ecd3635a1329c49bc3b97ba84ad4d53d847163) --- libavcodec/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 53a0674323..e9db33e9d7 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -396,6 +396,8 @@ int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic){ /* If internal buffer type return the same buffer */ if(pic->type == FF_BUFFER_TYPE_INTERNAL) { + if(s->pkt) pic->pkt_pts= s->pkt->pts; + else pic->pkt_pts= AV_NOPTS_VALUE; pic->reordered_opaque= s->reordered_opaque; return 0; }