Browse Source

Count all frames with codec_info_nb_frames not just ones with non zero

duration. I hope this breaks nothing. Its needed for my fix of issue1156

Originally committed as revision 22001 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Michael Niedermayer 16 years ago
parent
commit
ab392695d5
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      libavformat/utils.c

+ 1
- 2
libavformat/utils.c View File

@@ -2184,7 +2184,6 @@ int av_find_stream_info(AVFormatContext *ic)
}
codec_info_duration[st->index] += pkt->duration;
}
if (pkt->duration != 0)
st->codec_info_nb_frames++;

{
@@ -2241,7 +2240,7 @@ int av_find_stream_info(AVFormatContext *ic)
}
for(i=0;i<ic->nb_streams;i++) {
st = ic->streams[i];
if(st->codec_info_nb_frames>2 && !st->avg_frame_rate.num)
if(st->codec_info_nb_frames>2 && !st->avg_frame_rate.num && codec_info_duration[i])
av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
(st->codec_info_nb_frames-2)*(int64_t)st->time_base.den,
codec_info_duration[i] *(int64_t)st->time_base.num, 60000);


Loading…
Cancel
Save