Commit 43f1faf1 authored by michael's avatar michael

prefer container time_base for frame duration guess


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4190 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 823112c1
......@@ -632,16 +632,16 @@ static void compute_frame_duration(int *pnum, int *pden, AVStream *st,
*pden = 0;
switch(st->codec.codec_type) {
case CODEC_TYPE_VIDEO:
if(st->codec.time_base.num*1000 <= st->codec.time_base.den){
if(st->time_base.num*1000 > st->time_base.den){
*pnum = st->time_base.num;
*pden = st->time_base.den;
}else{
}else if(st->codec.time_base.num*1000 > st->codec.time_base.den){
*pnum = st->codec.time_base.num;
*pden = st->codec.time_base.den;
}
if (pc && pc->repeat_pict) {
*pden *= 2;
*pnum = (*pnum) * (2 + pc->repeat_pict);
if (pc && pc->repeat_pict) {
*pden *= 2;
*pnum = (*pnum) * (2 + pc->repeat_pict);
}
}
break;
case CODEC_TYPE_AUDIO:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment