comparison utils.c @ 1351:244017c6b2ae libavformat

fix r_frame_rate detection in mpeg4 streams with non integer fps
author michael
date Tue, 03 Oct 2006 19:13:27 +0000
parents 18d9db9590e6
children 0899bfe4105c
comparison
equal deleted inserted replaced
1350:f77cf5a063a8 1351:244017c6b2ae
1959 av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, ticks[j]*1000, 1001, INT_MAX); 1959 av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, ticks[j]*1000, 1001, INT_MAX);
1960 } 1960 }
1961 } 1961 }
1962 } 1962 }
1963 1963
1964 /* if no real frame rate, use the codec one */
1965 if (!st->r_frame_rate.num){ 1964 if (!st->r_frame_rate.num){
1966 st->r_frame_rate.num = st->codec->time_base.den; 1965 if( st->codec->time_base.den * (int64_t)st->time_base.num
1967 st->r_frame_rate.den = st->codec->time_base.num; 1966 <= st->codec->time_base.num * (int64_t)st->time_base.den){
1967 st->r_frame_rate.num = st->codec->time_base.den;
1968 st->r_frame_rate.den = st->codec->time_base.num;
1969 }else{
1970 st->r_frame_rate.num = st->time_base.den;
1971 st->r_frame_rate.den = st->time_base.num;
1972 }
1968 } 1973 }
1969 } 1974 }
1970 } 1975 }
1971 1976
1972 av_estimate_timings(ic); 1977 av_estimate_timings(ic);