]> git.sesse.net Git - ffmpeg/commitdiff
Set pkt_pts in avcodec_default_reget_buffer()
authorNicolas George <nicolas.george@normalesup.org>
Wed, 2 Feb 2011 20:54:14 +0000 (21:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Feb 2011 02:10:10 +0000 (03:10 +0100)
This was missed when pkt_pts was first added.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 62ecd3635a1329c49bc3b97ba84ad4d53d847163)

libavcodec/utils.c

index 53a06743233f70d9a3b6d5f70b9653ee723eb9b7..e9db33e9d75aa26073dae4cfa01a3f48280b5a11 100644 (file)
@@ -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;
     }