eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 18:40:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

fftools/ffmpeg_mux_init: Use 64bit for score computation in map_auto_video()

Browse Source 
Fixes: signed integer overflow: 10 * 1952737655 cannot be represented in type 'int'
Fixes: PoC_avi_demux

Found-by: 2ourc3 (Salim LARGO)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit cdbb5f1b93)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2025-08-13 00:59:20 +02:00
parent e835b06f2d
commit eda70e88cf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fftools/ffmpeg_mux_init.c
View File

@@ -1467,7 +1467,7 @@ static int map_auto_video(Muxer *mux, const OptionsContext *o)
{ {
AVFormatContext *oc = mux->fc; AVFormatContext *oc = mux->fc;
InputStream *best_ist = NULL; InputStream *best_ist = NULL;
int best_score = 0; int64_t best_score = 0;
int qcr; int qcr;
/* video: highest resolution */ /* video: highest resolution */
@@ -1478,16 +1478,16 @@ static int map_auto_video(Muxer *mux, const OptionsContext *o)
for (int j = 0; j < nb_input_files; j++) { for (int j = 0; j < nb_input_files; j++) {
InputFile *ifile = input_files[j]; InputFile *ifile = input_files[j];
InputStream *file_best_ist = NULL; InputStream *file_best_ist = NULL;
int file_best_score = 0; int64_t file_best_score = 0;
for (int i = 0; i < ifile->nb_streams; i++) { for (int i = 0; i < ifile->nb_streams; i++) {
InputStream *ist = ifile->streams[i]; InputStream *ist = ifile->streams[i];
int score; int64_t score;
if (ist->user_set_discard == AVDISCARD_ALL || if (ist->user_set_discard == AVDISCARD_ALL ||
ist->st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) ist->st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO)
continue; continue;
score = ist->st->codecpar->width * ist->st->codecpar->height score = ist->st->codecpar->width * (int64_t)ist->st->codecpar->height
+ 100000000 * !!(ist->st->event_flags & AVSTREAM_EVENT_FLAG_NEW_PACKETS) + 100000000 * !!(ist->st->event_flags & AVSTREAM_EVENT_FLAG_NEW_PACKETS)
+ 5000000*!!(ist->st->disposition & AV_DISPOSITION_DEFAULT); + 5000000*!!(ist->st->disposition & AV_DISPOSITION_DEFAULT);
if((qcr!=MKTAG('A', 'P', 'I', 'C')) && (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC)) if((qcr!=MKTAG('A', 'P', 'I', 'C')) && (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC))