]> git.sesse.net Git - ffmpeg/commitdiff
mov: Skip computing SAR from invalid display matrix elements
authorVittorio Giovara <vittorio.giovara@gmail.com>
Tue, 30 Mar 2021 14:47:39 +0000 (16:47 +0200)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Tue, 6 Apr 2021 14:52:07 +0000 (16:52 +0200)
libavformat/mov.c

index 8d19824910ff850def164427dd0b968371351647..43c55ef4a481f61278a2c27f280a5230ff8869bf 100644 (file)
@@ -4620,7 +4620,7 @@ static int mov_read_tkhd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
             disp_transform[i] = hypot(sc->display_matrix[0 + i],
                                       sc->display_matrix[3 + i]);
 
-        if (disp_transform[0] > 0       && disp_transform[1] > 0 &&
+        if (disp_transform[0] > 1       && disp_transform[1] > 1 &&
             disp_transform[0] < (1<<24) && disp_transform[1] < (1<<24) &&
             fabs((disp_transform[0] / disp_transform[1]) - 1.0) > 0.01)
             st->sample_aspect_ratio = av_d2q(