avformat/mov: Do not set aspect ratios that would contain zeros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/101/merge
Michael Niedermayer 10 years ago
parent 47795505ac
commit cc18ea8de0
  1. 3
      libavformat/mov.c

@ -2874,7 +2874,8 @@ static int mov_read_tkhd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
for (i = 0; i < 2; i++)
disp_transform[i] = sqrt(SQR(display_matrix[i][0]) + SQR(display_matrix[i][1]));
if (fabs((disp_transform[0] / disp_transform[1]) - 1.0) > 0.01)
if (disp_transform[0] > 0 && disp_transform[1] > 0 &&
fabs((disp_transform[0] / disp_transform[1]) - 1.0) > 0.01)
st->sample_aspect_ratio = av_d2q(
disp_transform[0] / disp_transform[1],
INT_MAX);

Loading…
Cancel
Save