[FFmpeg-cvslog] Set pkt_pts in avcodec_default_reget_buffer()

Nicolas George git
Fri Feb 4 03:37:01 CET 2011


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Wed Feb  2 21:54:14 2011 +0100| [cf96cce728fdc83a6ebf98997ebf90c3c2ec2052] | committer: Michael Niedermayer

Set pkt_pts in avcodec_default_reget_buffer()

This was missed when pkt_pts was first added.

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf96cce728fdc83a6ebf98997ebf90c3c2ec2052
---

 libavcodec/utils.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 53a0674..e9db33e 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;
     }




More information about the ffmpeg-cvslog mailing list