aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2006-12-29 21:41:06 +0000
committerMichael Niedermayer <michaelni@gmx.at>2006-12-29 21:41:06 +0000
commit4b96d28abcbfe6467927f7b5f2b4da073dc4c503 (patch)
tree57166f1a6a95839202e4f113f5189e01e63d223d
parent6268538afa94eeceb61928807d1af11d4d257789 (diff)
downloadffmpeg-4b96d28abcbfe6467927f7b5f2b4da073dc4c503.tar.gz
ignore duration of the first 2 frames in the max-time break check
fixes framerate detection for framerate_misdetected.wmv Originally committed as revision 7384 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 118a78f8c6..bb3376c295 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1880,7 +1880,8 @@ int av_find_stream_info(AVFormatContext *ic)
read_size += pkt->size;
st = ic->streams[pkt->stream_index];
- st->codec_info_duration += pkt->duration;
+ if(st->codec_info_nb_frames>1) //FIXME move codec_info_nb_frames and codec_info_duration from AVStream into this func
+ st->codec_info_duration += pkt->duration;
if (pkt->duration != 0)
st->codec_info_nb_frames++;