Revision efd8c1f6 libavcodec/h264.c

View differences:

libavcodec/h264.c
2210 2210
    h->outputed_poc = INT_MIN;
2211 2211
    h->prev_poc_msb= 1<<16;
2212 2212
    reset_sei(h);
2213
    if(avctx->codec_id == CODEC_ID_H264)
2213
    if(avctx->codec_id == CODEC_ID_H264){
2214
        if(avctx->ticks_per_frame == 1){
2215
            s->avctx->time_base.den *=2;
2216
        }
2214 2217
        avctx->ticks_per_frame = 2;
2218
    }
2215 2219
    return 0;
2216 2220
}
2217 2221

  
......
3776 3780
                s->avctx->time_base.den *= 2;
3777 3781
            av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den,
3778 3782
                      s->avctx->time_base.num, s->avctx->time_base.den, 1<<30);
3779
        }else if(!h->sps.time_scale && !s->avctx->frame_number){
3780
            s->avctx->time_base.den *=2;
3781
            h->sps.time_scale= s->avctx->time_base.den;
3782 3783
        }
3783 3784
    }
3784 3785

  

Also available in: Unified diff