From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DE56E43634 for ; Tue, 18 Oct 2022 05:02:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2607B68B9FC; Tue, 18 Oct 2022 08:02:28 +0300 (EEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E160668B15F for ; Tue, 18 Oct 2022 08:02:21 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666069347; x=1697605347; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=G3U+clLkNDvKounySusYJsr8p+FaVgAMBNDclXfjIKQ=; b=NHgVew9qMohge1o6lyJpfpYYQK7w0zm7oMtTB3J1zvO73MNIz7QxfzxK RcSlYx9SenMt2612njW0cNTa/5li51zQz54vCylDsMPg7wruF/14Lsc+k IMbCOFlkKkLBPc2/hUnY6vyUtiasC6U82VpESFihl4EuT/B5B8r38Al9t 6alg+q1GcKoooChn2Ar+Z+WhCMCR7ClVGdrI2Pjz/vXOxMmJjhgNIypiR pEPrP6acYBj3gJb/GxEFDiRXc2s+VeS17g1cqCDrl7R/6R0+vkDs+IWPL U1Hx73702U/Ng5ZvEDkkeTN89Eowcdm8+aYf6BcEnKKmo666UTLTJN4VZ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="286388460" X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="286388460" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2022 22:02:18 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="803598091" X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="803598091" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2022 22:02:16 -0700 From: haihao.xiang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 12:59:23 +0800 Message-Id: <20221018045925.258081-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavc/qsvenc: fix check to avoid segfault X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Haihao Xiang Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Haihao Xiang Signed-off-by: Haihao Xiang --- libavcodec/qsvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 15e6936a65..19fe6e59a2 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -2093,8 +2093,8 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, pkt.bs->ExtParam = enc_buf; } - if (q->set_encode_ctrl_cb) { - q->set_encode_ctrl_cb(avctx, frame, &qsv_frame->enc_ctrl); + if (q->set_encode_ctrl_cb && enc_ctrl) { + q->set_encode_ctrl_cb(avctx, frame, enc_ctrl); } if ((avctx->codec_id == AV_CODEC_ID_H264 || -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".