Browse Source

avformat/matroskadec: Fix float-cast-overflow undefined behavior in matroska_parse_tracks()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n4.0
Nikolas Bowe Michael Niedermayer 7 years ago
parent
commit
e07649e618
1 changed files with 10 additions and 2 deletions
  1. +10
    -2
      libavformat/matroskadec.c

+ 10
- 2
libavformat/matroskadec.c View File

@@ -2096,8 +2096,16 @@ static int matroska_parse_tracks(AVFormatContext *s)
}

if (track->type == MATROSKA_TRACK_TYPE_VIDEO) {
if (!track->default_duration && track->video.frame_rate > 0)
track->default_duration = 1000000000 / track->video.frame_rate;
if (!track->default_duration && track->video.frame_rate > 0) {
double default_duration = 1000000000 / track->video.frame_rate;
if (default_duration > UINT64_MAX || default_duration < 0) {
av_log(matroska->ctx, AV_LOG_WARNING,
"Invalid frame rate %e. Cannot calculate default duration.\n",
track->video.frame_rate);
} else {
track->default_duration = default_duration;
}
}
if (track->video.display_width == -1)
track->video.display_width = track->video.pixel_width;
if (track->video.display_height == -1)


Loading…
Cancel
Save