From fa48da1ee9ce2a29319159b0509ec0905b0e115a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 25 Oct 2012 01:16:34 +0200 Subject: [PATCH] ffmpeg: fix null ptr deref in psnr printing code Fixes CID205005 Signed-off-by: Michael Niedermayer --- ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index 03cefc8327..f86ecd554c 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1123,7 +1123,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti for (j = 0; j < 32; j++) snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%X", (int)lrintf(log2(qp_histogram[j] + 1))); } - if (enc->flags&CODEC_FLAG_PSNR) { + if ((enc->flags&CODEC_FLAG_PSNR) && (enc->coded_frame || is_last_report)) { int j; double error, error_sum = 0; double scale, scale_sum = 0;