From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 24 Sep 2004 17:30:04 +0000 (+0000)
Subject: 100l
X-Git-Tag: v0.5~14685
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3c00436b3eedca1f5ebcc005ac2d019ae24b0d1a;p=platform%2Fupstream%2Flibav.git

100l

Originally committed as revision 3501 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index eef8346..b3faf83 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1974,15 +1974,16 @@ static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg){
                 return -1;
             }
         }
+        s->user_specified_pts= pic->pts;
     }else{
         if(s->user_specified_pts != AV_NOPTS_VALUE){
+            s->user_specified_pts= 
             pic->pts= s->user_specified_pts + AV_TIME_BASE*(int64_t)s->avctx->frame_rate_base / s->avctx->frame_rate;
             av_log(s->avctx, AV_LOG_INFO, "Warning: AVFrame.pts=? trying to guess (%Ld)\n", pic->pts);
         }else{
             pic->pts= av_rescale(pic->display_picture_number*(int64_t)s->avctx->frame_rate_base, AV_TIME_BASE, s->avctx->frame_rate);
         }
     }
-    s->user_specified_pts= pic->pts;
   }
   
     /* shift buffer entries */