Commit 90ce897e authored by michael's avatar michael

analyze end condition must match r_fps selection condition

fixes fps for Channel\ 4\ News_Channel\ 4_20_10_2006_19_00_01.dvr-ms


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@8557 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 135024dc
...@@ -1697,7 +1697,7 @@ int av_find_stream_info(AVFormatContext *ic) ...@@ -1697,7 +1697,7 @@ int av_find_stream_info(AVFormatContext *ic)
if (!has_codec_parameters(st->codec)) if (!has_codec_parameters(st->codec))
break; break;
/* variable fps and no guess at the real fps */ /* variable fps and no guess at the real fps */
if( st->codec->time_base.den >= 101LL*st->codec->time_base.num if( (st->codec->time_base.den >= 101LL*st->codec->time_base.num || st->codec->codec_id == CODEC_ID_MPEG2VIDEO)
&& duration_count[i]<20 && st->codec->codec_type == CODEC_TYPE_VIDEO) && duration_count[i]<20 && st->codec->codec_type == CODEC_TYPE_VIDEO)
break; break;
if(st->parser && st->parser->parser->split && !st->codec->extradata) if(st->parser && st->parser->parser->split && !st->codec->extradata)
......
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