diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-03-30 15:05:09 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-03-30 15:05:09 +0000 |
| commit | 6cc65ab3c68d5db6245473fab13f83d6a5194f41 (patch) | |
| tree | d8cd1c27b9cf873d51844c78ba93932344453222 /libavformat | |
| parent | f9645d7cc41c0bc852bd21ec3d0e6a703fda41dd (diff) | |
| download | ffmpeg-6cc65ab3c68d5db6245473fab13f83d6a5194f41.tar.gz | |
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
Originally committed as revision 8557 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 6ff6a7962a..36cb269b50 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1697,7 +1697,7 @@ int av_find_stream_info(AVFormatContext *ic) if (!has_codec_parameters(st->codec)) break; /* 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) break; if(st->parser && st->parser->parser->split && !st->codec->extradata) |