virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-30 22:24:04 +02:00
Code Issues Releases Activity

avcodec/imgconvert: fix possible null pointer dereference

Browse Source 
regression since 354b26a394

(cherry picked from commit 8c2c97403b)
(cherry picked from commit c1e172c2e1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Simon Thelen
2018-04-03 14:41:33 +02:00
committed by Michael Niedermayer
parent 9ffbda72c7
commit 03af6ab540
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/imgconvert.c
View File

@ -84,10 +84,11 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *p
int loss; int loss;
for (i=0; pix_fmt_list[i] != AV_PIX_FMT_NONE; i++) { for (i=0; pix_fmt_list[i] != AV_PIX_FMT_NONE; i++) {
loss = *loss_ptr; loss = loss_ptr ? *loss_ptr : 0;
best = avcodec_find_best_pix_fmt_of_2(best, pix_fmt_list[i], src_pix_fmt, has_alpha, &loss); best = avcodec_find_best_pix_fmt_of_2(best, pix_fmt_list[i], src_pix_fmt, has_alpha, &loss);
} }
if (loss_ptr)
*loss_ptr = loss; *loss_ptr = loss;
return best; return best;
} }