Commit c1c88455 authored by michael's avatar michael

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@22001 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent d52b5086
...@@ -2184,7 +2184,6 @@ int av_find_stream_info(AVFormatContext *ic) ...@@ -2184,7 +2184,6 @@ int av_find_stream_info(AVFormatContext *ic)
} }
codec_info_duration[st->index] += pkt->duration; codec_info_duration[st->index] += pkt->duration;
} }
if (pkt->duration != 0)
st->codec_info_nb_frames++; st->codec_info_nb_frames++;
{ {
...@@ -2241,7 +2240,7 @@ int av_find_stream_info(AVFormatContext *ic) ...@@ -2241,7 +2240,7 @@ int av_find_stream_info(AVFormatContext *ic)
} }
for(i=0;i<ic->nb_streams;i++) { for(i=0;i<ic->nb_streams;i++) {
st = ic->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, av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
(st->codec_info_nb_frames-2)*(int64_t)st->time_base.den, (st->codec_info_nb_frames-2)*(int64_t)st->time_base.den,
codec_info_duration[i] *(int64_t)st->time_base.num, 60000); codec_info_duration[i] *(int64_t)st->time_base.num, 60000);
......
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