diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2003-10-30 16:58:49 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2003-10-30 16:58:49 +0000 |
commit | 5f1948111a4920ff74e31b4284ab0200f7938539 (patch) | |
tree | 1fe454e88a052f6172e6b8746b76e5361e86679b /libavcodec/h263.c | |
parent | 2a2bbcb05fde486eef76d070f26eecddd4de0ace (diff) | |
download | ffmpeg-5f1948111a4920ff74e31b4284ab0200f7938539.tar.gz |
pts fix and related fixes
Originally committed as revision 2452 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263.c')
-rw-r--r-- | libavcodec/h263.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 4746dbff90..4eba29c5f5 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -1848,8 +1848,8 @@ void ff_mpeg4_stuffing(PutBitContext * pbc) void ff_set_mpeg4_time(MpegEncContext * s, int picture_number){ int time_div, time_mod; - if(s->current_picture.pts) - s->time= (s->current_picture.pts*s->time_increment_resolution + 500*1000)/(1000*1000); + if(s->current_picture_ptr->pts) + s->time= (s->current_picture_ptr->pts*s->time_increment_resolution + 500*1000)/(1000*1000); else s->time= av_rescale(picture_number*(int64_t)s->avctx->frame_rate_base, s->time_increment_resolution, s->avctx->frame_rate); time_div= s->time/s->time_increment_resolution; @@ -4994,9 +4994,9 @@ static int decode_vop_header(MpegEncContext *s, GetBitContext *gb){ - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2; } - s->current_picture.pts= s->time*1000LL*1000LL / s->time_increment_resolution; + s->current_picture_ptr->pts= s->time*1000LL*1000LL / s->time_increment_resolution; if(s->avctx->debug&FF_DEBUG_PTS) - printf("MPEG4 PTS: %f\n", s->current_picture.pts/(1000.0*1000.0)); + printf("MPEG4 PTS: %f\n", s->current_picture_ptr->pts/(1000.0*1000.0)); check_marker(gb, "before vop_coded"); |