From patchwork Thu Jan 9 10:52:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 17270 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 36DEE44B628 for ; Thu, 9 Jan 2020 12:53:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1088568AC76; Thu, 9 Jan 2020 12:53:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3E7E689D90 for ; Thu, 9 Jan 2020 12:53:12 +0200 (EET) Received: by mail-pj1-f66.google.com with SMTP id r67so1010728pjb.0 for ; Thu, 09 Jan 2020 02:53:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=TXL/VcfovgVocEGyU16o6UL6zYadl3+/0YhDj2JthBQ=; b=cr8DrxUZ8l8wx6/Rj/ukp9/mN1XTZZRhnTtBh/AVtgkcPEWCDPAlOLH+OKxCpVnbtM iqSPy8Beb9djza9doSSNgE5Bou96zy/wSSDw+wqGCW5wkVbFHzrvd9PHeTnPJ/g2aGxe LGJLQ3VQ19t1nvQDCn3lsNzq1LbQ5uTMV5Q9MFMA8V1bUxrBnbyBb3ifnQdD5f6adtMi aSpsKBG0nx8+dd0OslC5P7rm7ULheRi3xnZyUaqegJ89uwhRQTzFPxTpUUk5ZTasG19S 74edIPJRRfIBYE2B1hEWtywm/9nzxQTSz9vViacTaCvszK5u2Tn4Xmbhc7twAKVpFJnv iY+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TXL/VcfovgVocEGyU16o6UL6zYadl3+/0YhDj2JthBQ=; b=YixujjIwViaYFJkGhXlTEFK11PW7B23k8TScjXF0zYc+f+GM0/9ZH+kY5WG511p9RM 7qxunJXif0Zby8Y8whwJ1FIbsqwjeYLIT2rym6RUVFFGAZFD/Gx41oz6ldXy5zCrowfk XpMwSFPWLndj8FmAk8X9XR6kBGFAsTIwjJft7ZPJrj71PBBUPxC87+ozD27wVTGxM6t/ iRg5gBJvCrw8F1YWfOoRVqPWwpbXhMaoylp3118LcVPV0lLRUq+WpbCmRvsAIpGKHxRl /7LtW9xg+8VtkqkVyiRmQn8xqGkjHY3AAWdyXyHaU/5tacs2XkT0smyUCirFNTKFP9c+ tN/Q== X-Gm-Message-State: APjAAAWmGDQjbYeAoQKin8CydcnEmAXSPhQ7e6HjEi6YqRChpqcVFU1k TW9EX2WrN0C/XKV5/KIGr9O27Vh2 X-Google-Smtp-Source: APXvYqztmQ6G8WUmfGjYSyBp2e+vcdu2RiENUz+XHs9+bqAINRY0MP/j1Yqi40aAcf24rqlOXFBSsg== X-Received: by 2002:a17:90a:2486:: with SMTP id i6mr4715332pje.9.1578567190921; Thu, 09 Jan 2020 02:53:10 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j17sm7245304pfa.28.2020.01.09.02.53.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Jan 2020 02:53:10 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Jan 2020 18:52:45 +0800 Message-Id: <20200109105245.3950-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1] avcodec/libx265: Fix Uninitialized scalar variable X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Fixes CID 1457234 Signed-off-by: Limin Wang --- libavcodec/libx265.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 9e4711e50b..7f18db92e4 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -549,6 +549,8 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, case X265_TYPE_BREF: pict_type = AV_PICTURE_TYPE_B; break; + default: + pict_type = AV_PICTURE_TYPE_NONE; } #if FF_API_CODED_FRAME From patchwork Fri Jan 17 04:48:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 17393 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A5D2544BEA8 for ; Fri, 17 Jan 2020 06:49:04 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8496F68AFFE; Fri, 17 Jan 2020 06:49:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FACD68A9FC for ; Fri, 17 Jan 2020 06:48:58 +0200 (EET) Received: by mail-pf1-f178.google.com with SMTP id 2so11336142pfg.12 for ; Thu, 16 Jan 2020 20:48:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=au2rO6xQclSL8A9Z6uY0TPIhD5VOrVnW/QAvvtBuI5Q=; b=ieahpwmP3PWLELJgQ9Kkrtjnp/tnfkajtqOY3aq3yO9EOrI4HsndWS3oxKd7fKhHho V0FkWBNhYO5guJ0ZQKhhex/K471mhAfx1Zm3EHWMwUUmlYyGcDgB01S5kTikc0OflEzu 1Y+Y1KkwVeJpg7UIgQmTQlXY7Emj+jLvWpR+p2tZtqrsv2vf80BFHvr/a+gf3oFxglaM ntC+SBeWEFk/rPmHDJX3JyLP+m/bow/uXe++6IfETLk4gyDofDaRqdAa7fda5XLiybMH 9PEfnqZD/KwC4t07RCj1LKySX3GNyrSAnJg8krdoKkB9/p07bLrb7k4LgR9zKjC+piGi oKUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=au2rO6xQclSL8A9Z6uY0TPIhD5VOrVnW/QAvvtBuI5Q=; b=CHDbwAGLHiLV2wOyIzZELq5M403KoEbw33R7zMA7/q3uxfdvHGHRsnUjTY/G9UJ+ow gVSeLBp4rzC9pFpfkUd0RQ4t6293HyzUUudiELMRXCFQiGfdwPdZ1ZP9MVFCG0Cl9rWx e7VavZKijt9zW2FmX9pBJLkUT+1/9sEPtT69Vrm7CVtHVE9tWaKZMHJdpB/ZeqbYbxog dNIydk+K62Tn8SBs0hLms3HiZAoB4yMp42H+0bzgeASrZwco5ypSxiUM64o+sDe1qkIe nqo7xzAj1N9oBGwnDDQe+pq5c0xrZgyqgaaDHpC2ioHgKJKdZpYx6CqANPJtRhrynxBG Fuuw== X-Gm-Message-State: APjAAAW5oOGMwCuaIYsRFhd6Q5ppKim5D2xTz9rWP/1Q0L5mp4rLGY5I in6MePNTrQu6J7eXL+Vdp9XMj4OP X-Google-Smtp-Source: APXvYqzO614eDaK+NNdtQHBWG/H4EQEza7InDMdv/bSkwlEbxqdvAebAqjubTBz9xyX8AsT03FAgJw== X-Received: by 2002:a63:197:: with SMTP id 145mr44072158pgb.11.1579236536002; Thu, 16 Jan 2020 20:48:56 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id p21sm26917516pfn.103.2020.01.16.20.48.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jan 2020 20:48:55 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Jan 2020 12:48:48 +0800 Message-Id: <20200117044848.2829-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200117044848.2829-1-lance.lmwang@gmail.com> References: <20200109105245.3950-1-lance.lmwang@gmail.com> <20200117044848.2829-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/2] avcodec/libx264: return error if unknown picture type encountered X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/libx264.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index ca8f6c0..4fef0be 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -471,7 +471,8 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, pict_type = AV_PICTURE_TYPE_B; break; default: - pict_type = AV_PICTURE_TYPE_NONE; + av_log(avctx, AV_LOG_ERROR, "Unknown picture type encountered.\n"); + return AVERROR_EXTERNAL; } #if FF_API_CODED_FRAME FF_DISABLE_DEPRECATION_WARNINGS