diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-09-24 17:30:04 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-09-24 17:30:04 +0000 |
| commit | 3c00436b3eedca1f5ebcc005ac2d019ae24b0d1a (patch) | |
| tree | 0167d356be09643d995234a20528a27b40560e18 | |
| parent | 61cef2937927e44eed0f40f8e5db0a3ed520d914 (diff) | |
| download | ffmpeg-3c00436b3eedca1f5ebcc005ac2d019ae24b0d1a.tar.gz | |
100l
Originally committed as revision 3501 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index eef8346df9..b3faf830a9 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 */ |