RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/matroskadec: don't infer display dimensions when DisplayUnit is not pixels 

The spec doesn't define a default value for other values of DisplayUnit.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-07-07 16:51:02 -03:00
parent d570457eb7
commit dc763efe70
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/matroskadec.c
View File

@ -2966,6 +2966,7 @@ static int mkv_parse_video(MatroskaTrack *track, AVStream *st,
if (track->video.display_unit < MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN) { if (track->video.display_unit < MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN) {
if (track->video.display_width && track->video.display_height && if (track->video.display_width && track->video.display_height &&
track->video.display_width != -1 && track->video.display_height != -1 &&
par->height < INT64_MAX / track->video.display_width / display_width_mul && par->height < INT64_MAX / track->video.display_width / display_width_mul &&
par->width < INT64_MAX / track->video.display_height / display_height_mul) par->width < INT64_MAX / track->video.display_height / display_height_mul)
av_reduce(&st->sample_aspect_ratio.num, av_reduce(&st->sample_aspect_ratio.num,
@ -3139,10 +3140,12 @@ static int matroska_parse_tracks(AVFormatContext *s)
track->default_duration = default_duration; track->default_duration = default_duration;
} }
} }
if (track->video.display_unit == MATROSKA_VIDEO_DISPLAYUNIT_PIXELS) {
if (track->video.display_width == -1) if (track->video.display_width == -1)
track->video.display_width = track->video.pixel_width; track->video.display_width = track->video.pixel_width;
if (track->video.display_height == -1) if (track->video.display_height == -1)
track->video.display_height = track->video.pixel_height; track->video.display_height = track->video.pixel_height;
}
} else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) { } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {
if (!track->audio.out_samplerate) if (!track->audio.out_samplerate)
track->audio.out_samplerate = track->audio.samplerate; track->audio.out_samplerate = track->audio.samplerate;