eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-17 04:20:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

avfilter/vf_scale_d3d12: fix integer overflow in input framerate calculation

Browse Source 
Also removes pointless intermediate variables that caused
the overflow and truncation to happen in the first place.

Fixes #YWH-PGM40646-1
This commit is contained in:
Timo Rothenpieler
2025-12-08 14:18:36 +01:00
parent c4d22f2d2c
commit 338889c0d9
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/vf_scale_d3d12.c
View File

@@ -155,8 +155,6 @@ static DXGI_COLOR_SPACE_TYPE get_dxgi_colorspace(enum AVColorSpace colorspace, e
static AVRational get_input_framerate(AVFilterContext *ctx, AVFilterLink *inlink, AVFrame *in) static AVRational get_input_framerate(AVFilterContext *ctx, AVFilterLink *inlink, AVFrame *in)
{ {
int64_t duration_scaled;
int64_t time_base_den;
AVRational framerate = {0, 0}; AVRational framerate = {0, 0};
if (in->duration > 0 && inlink->time_base.num > 0 && inlink->time_base.den > 0) { if (in->duration > 0 && inlink->time_base.num > 0 && inlink->time_base.den > 0) {
@@ -164,13 +162,9 @@ static AVRational get_input_framerate(AVFilterContext *ctx, AVFilterLink *inlink
* Calculate framerate from frame duration and timebase * Calculate framerate from frame duration and timebase
* framerate = 1 / (duration * timebase) * framerate = 1 / (duration * timebase)
*/ */
duration_scaled = in->duration * inlink->time_base.num;
time_base_den = inlink->time_base.den;
framerate.num = time_base_den;
framerate.den = duration_scaled;
/* Reduce the fraction */
av_reduce(&framerate.num, &framerate.den, av_reduce(&framerate.num, &framerate.den,
framerate.num, framerate.den, INT_MAX); inlink->time_base.den, in->duration * inlink->time_base.num,
INT_MAX);
} else if (inlink->time_base.num > 0 && inlink->time_base.den > 0) { } else if (inlink->time_base.num > 0 && inlink->time_base.den > 0) {
/* Estimate from timebase (inverse of timebase is often the framerate) */ /* Estimate from timebase (inverse of timebase is often the framerate) */
framerate.num = inlink->time_base.den; framerate.num = inlink->time_base.den;