diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-09-26 18:34:07 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-09-26 18:34:07 +0000 |
| commit | 730ba4067ce34572f4336d7e135caa9327a108a3 (patch) | |
| tree | aacef3ec7877f1fa00bc2b8edb9fea858f8c8f46 /libavformat | |
| parent | 89cba1bd7db840b1c1b964ec35645cb77ec30d64 (diff) | |
fix r_frame_rate init code for groundhog.vob
Originally committed as revision 6345 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 3fdcb3a920..09be967708 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1873,7 +1873,10 @@ int av_find_stream_info(AVFormatContext *ic) duration_sum[index]= duration; duration_count[index]=1; }else{ - int factor= av_rescale(duration, duration_count[index], duration_sum[index]); + int factor= av_rescale(2*duration, duration_count[index], duration_sum[index]); + if(factor==3) + duration_count[index] *= 2; + factor= av_rescale(duration, duration_count[index], duration_sum[index]); duration_sum[index] += duration; duration_count[index]+= factor; } @@ -1931,7 +1934,9 @@ int av_find_stream_info(AVFormatContext *ic) if(st->codec->codec_id == CODEC_ID_RAWVIDEO && !st->codec->codec_tag && !st->codec->bits_per_sample) st->codec->codec_tag= avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt); - if(duration_count[i] && st->codec->time_base.num*101LL <= st->codec->time_base.den && + if(duration_count[i] + && (st->codec->time_base.num*101LL <= st->codec->time_base.den || st->codec->codec_id == CODEC_ID_MPEG2VIDEO) && + //FIXME we should not special case mpeg2, but this needs testing with non mpeg2 ... st->time_base.num*duration_sum[i]/duration_count[i]*101LL > st->time_base.den){ int64_t num, den, error, best_error; @@ -1946,11 +1951,12 @@ int av_find_stream_info(AVFormatContext *ic) av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, j, 12, INT_MAX); } } - for(j=24; j<=30; j+=6){ - error= ABS(1001*12*num - 1000*12*j*den); + for(j=0; j<3; j++){ + static const int ticks[]= {24,30,60}; + error= ABS(1001*12*num - 1000*12*den * ticks[j]); if(error < best_error){ best_error= error; - av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, j*1000, 1001, INT_MAX); + av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den, ticks[j]*1000, 1001, INT_MAX); } } } |