virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

Adjust time_base exactly when changing ticks_per_frame to 2 this is safer

Browse Source 
and for some raw h264 we managed to change the timebase twice before.

Originally committed as revision 17669 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2009-02-28 20:58:07 +00:00
parent cd0d9a9de6
commit efd8c1f64d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/h264.c
View File

@ -2210,8 +2210,12 @@ static av_cold int decode_init(AVCodecContext *avctx){
h->outputed_poc = INT_MIN;
h->prev_poc_msb= 1<<16;
reset_sei(h);
if(avctx->codec_id == CODEC_ID_H264)
if(avctx->codec_id == CODEC_ID_H264){
if(avctx->ticks_per_frame == 1){
s->avctx->time_base.den *=2;
}
avctx->ticks_per_frame = 2;
}
return 0;
}
@ -3776,9 +3780,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
s->avctx->time_base.den *= 2;
av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den,
s->avctx->time_base.num, s->avctx->time_base.den, 1<<30);
}else if(!h->sps.time_scale && !s->avctx->frame_number){
s->avctx->time_base.den *=2;
h->sps.time_scale= s->avctx->time_base.den;
}
}