From patchwork Sun Mar 24 10:55:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 12409 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 61D5744954A for ; Sun, 24 Mar 2019 12:58:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B58D68AA64; Sun, 24 Mar 2019 12:58:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-1.mx.upcmail.net (vie01a-dmta-pe06-1.mx.upcmail.net [84.116.36.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB211689B11 for ; Sun, 24 Mar 2019 12:57:53 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1h80p7-0005yC-1o for ffmpeg-devel@ffmpeg.org; Sun, 24 Mar 2019 11:57:53 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 80o7hJ1XdxLwq80o8hjKX3; Sun, 24 Mar 2019 11:56:52 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=WaxylHpX c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=K9Y52bHntymymITc5RUA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 24 Mar 2019 11:55:44 +0100 Message-Id: <20190324105544.5335-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190324105544.5335-1-michael@niedermayer.cc> References: <20190324105544.5335-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfGyt3DF6TmfDVVpFcgovtCpUijTkbnhrKTJbgR4fChCzO+sNf9IwpRJTJbAtCfEDSXt/OARvaRxfrT3VCgX1ZGl/qWtZmvDRW5vYWbJ4utlsuvyuSLu5 y7jeqEd9AIBLBzgXWcESLsuA1TF5WszkwHfB3vcmjyTED/JNSzz6p+3I Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/hevcdec: Fix return code for explode mode 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libavcodec/hevcdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index fe4b5fdb5b..b7e2d68f5e 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2923,6 +2923,7 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) return ret; if (ret == 1) { av_log(s->avctx, AV_LOG_ERROR, "Two slices reporting being the first in the same frame.\n"); + ret = AVERROR_INVALIDDATA; goto fail; }