highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffprobe: Avoid overflow when calculating DAR

Browse Source 
Both the codecpar's width and height, and the SAR num and den are
ints, which can overflow. Cast to int64_t, which is what av_reduce
takes.

Without this, occasionally, display_aspect_ratio can be negative in
ffprobe's -show_stream output.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2024-05-03 17:33:58 +01:00
parent 088bf6e8c1
commit f8a613d6a8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fftools/ffprobe.c
View File

@ -3324,8 +3324,8 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
if (sar.num) { if (sar.num) {
print_q("sample_aspect_ratio", sar, ':'); print_q("sample_aspect_ratio", sar, ':');
av_reduce(&dar.num, &dar.den, av_reduce(&dar.num, &dar.den,
par->width * sar.num, (int64_t) par->width * sar.num,
par->height * sar.den, (int64_t) par->height * sar.den,
1024*1024); 1024*1024);
print_q("display_aspect_ratio", dar, ':'); print_q("display_aspect_ratio", dar, ':');
} else { } else {