From patchwork Fri Jan 17 22:38:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 17400 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 C8DA7447940 for ; Sat, 18 Jan 2020 00:38:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A280068AF04; Sat, 18 Jan 2020 00:38:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A378D68A280 for ; Sat, 18 Jan 2020 00:38:32 +0200 (EET) Received: by mail-pj1-f48.google.com with SMTP id s7so3970734pjc.0 for ; Fri, 17 Jan 2020 14:38:32 -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=hqmmnOpHF6FoM8R23/w9DAPq71qD/zz9w4d5p/yH2tQ=; b=Vk+NXCrwDLTz8Ewgnds51vnT8JxhreQxK7I8lZ0Ha4j3XWa1wpg4yZgfNHDOJJZGFx yqiOP/SmiMGYgWxrmmhyTkjbMrI0Ows6EPk9QYwGlT7jbcT8+02WEtf1rcCFGRBQg36Z M1F02Y+D1UqaDKNKz8VFRMWhunTcQjPpNkPLf+ZfWb/amHHxjpgWB7xleY0TAguR0z+x nLme43nX9q36WAGulnnqFUD1s5PzIiibr6+TDOKDeoqMCEwCjRqoYF0ReZbfv1NkfAyy Csq9eDkZfswjthOoQ6MUK2ZCmKA7om0zpbOFzRcyhSYZCnVObejy6MlGfa91oVmKpL1f Ridw== 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=hqmmnOpHF6FoM8R23/w9DAPq71qD/zz9w4d5p/yH2tQ=; b=mHE2WkYkb4oZ25BRp5oDzFiBULHwxbvaJ2ZT5rLl0+BKu9G4t9DnC0BMyvIK1J9ZF1 ZoeK/YjZuFonSG1DUgTs5baVrimjuzECtokka9qy3+bHYopXhqJNplmyvY9G5jcUs4Q/ bCCuQTRZS2ck56J4Q4ncEdg7LWK3TkQoc9o/AjFr0gZHNChDtuzDqpdD5NpLlg9hzvC4 7rpLKtVD/cjlq/e+DDmsIpPKWgIe/RhreLk/MpKjz079RPEckzv5Awez82dRp3PiIgjD +YxmNC68n0C/m6MYnJ7PNzdg5WMzWLPE7BTrfz5xiE7CG1cgupKEqGJCd8AR0AUgaFbw Xxjw== X-Gm-Message-State: APjAAAV+aSDB+dZoN0FFqVw1JziG7Pd5qFb3b8i9TSiVQLGav2jTPijx YxjKIAg04FlbLI2mMQVRoCMEXy9x X-Google-Smtp-Source: APXvYqyxay4NJW6PQHkt2bg88EVnx9AP9M2RA308jBqvQbWHsOn2TUlels7Rn6SBG2LGWgkpQWWoPQ== X-Received: by 2002:a17:90a:c705:: with SMTP id o5mr8459886pjt.67.1579300710905; Fri, 17 Jan 2020 14:38:30 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id d2sm8617927pjv.18.2020.01.17.14.38.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jan 2020 14:38:30 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Jan 2020 06:38:25 +0800 Message-Id: <20200117223825.12936-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200109105245.3950-1-lance.lmwang@gmail.com> References: <20200109105245.3950-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(ctx, AV_LOG_ERROR, "Unknown picture type encountered.\n"); + return AVERROR_EXTERNAL; } #if FF_API_CODED_FRAME FF_DISABLE_DEPRECATION_WARNINGS