virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

mov: compute avg_frame_rate only if duration is known

Browse Source 
Fixes an assert in fuzzed sample sample.mp4_s265930.
This commit is contained in:
Janne Grunau
2012-11-23 16:33:36 +01:00
parent 480be07a96
commit 80b6b31417
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mov.c
View File

@@ -2052,8 +2052,9 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom)
((double)st->codec->width * sc->height), INT_MAX); ((double)st->codec->width * sc->height), INT_MAX);
} }
av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den, if (st->duration != AV_NOPTS_VALUE)
sc->time_scale*st->nb_frames, st->duration, INT_MAX); av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
sc->time_scale*st->nb_frames, st->duration, INT_MAX);
#if FF_API_R_FRAME_RATE #if FF_API_R_FRAME_RATE
if (sc->stts_count == 1 || (sc->stts_count == 2 && sc->stts_data[1].count == 1)) if (sc->stts_count == 1 || (sc->stts_count == 2 && sc->stts_data[1].count == 1))