summaryrefslogtreecommitdiff
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-01-18 23:56:04 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-01-18 23:56:04 +0000
commitc3aeaa540d6ff7b9829c3af1ffec3c708ddc70f7 (patch)
treeb70d9df334d90f7003e6186fff6b4aa5e7e863c7 /libavformat/utils.c
parent7231ccf4d53cea4854d4168640d6b3809d3a7771 (diff)
set average frame rate in mov demuxer
Originally committed as revision 21310 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 000ab9050e..64c5ec492b 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2218,7 +2218,7 @@ int av_find_stream_info(AVFormatContext *ic)
}
for(i=0;i<ic->nb_streams;i++) {
st = ic->streams[i];
- if(codec_info_nb_frames[i]>2)
+ if(codec_info_nb_frames[i]>2 && !st->avg_frame_rate.num)
av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
(codec_info_nb_frames[i]-2)*(int64_t)st->time_base.den,
codec_info_duration[i] *(int64_t)st->time_base.num, 60000);