summaryrefslogtreecommitdiff
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-01-01 21:17:14 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-01-01 21:17:14 +0000
commitecec87afc6f14794c7062ee4e83d05c6da1fd944 (patch)
treecbd407bf74907142fd5f37bb61c4f55ec0344a2a /libavformat/utils.c
parentaac88b534c84a4bb7e0082b64f215762517f8e5b (diff)
revert regression test breaking change
Originally committed as revision 7394 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index bb3376c295..9aa97480ad 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1960,7 +1960,7 @@ 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]>1
+ if(1
&& (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*/){