From patchwork Sat Nov 25 21:49:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 6360 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3885225jah; Sat, 25 Nov 2017 13:49:29 -0800 (PST) X-Google-Smtp-Source: AGs4zMb+ZJ6TfdqS8Qb2bmKKqwrKkCqyKF76rq9Rh0LOFqYkbJzdAlUCjU866COynci7K8Gd/s+3 X-Received: by 10.28.221.138 with SMTP id u132mr12128662wmg.113.1511646568971; Sat, 25 Nov 2017 13:49:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511646568; cv=none; d=google.com; s=arc-20160816; b=EHKdpSwLZuQMkjDGHenaeeg+x2OL935eH4RQKN6ekFl1DgmzZcS94/JHX1Nsn+FAya Il1QO+AlwdZVMfMMRsMh709lsBt9S5UIgchdYWfPaAtbwaV8mHxNZusjST83kY5IZ+5b SXC2Sn/dF6ocHS1c3rtCYvAmfGuQ0tg65HfxzNLWa2/gTWrxo1YvsnD/AG6CUjPh6gdJ mjLtyeG5MU62+orql89jQ6bVL65kDMGBNlH3caZ7UJpOmxil+Hg44s63QR7BaBsxTzQO vRDWLqn2H26e5w/aLUh/hAeCMS5mkIejS0SCjiA10gm+DMmboKVDUog/W8WGXqpkw6rX jAIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=IUOLBLOzrH+8zIjSEN4aHCJujKxiCmQ60/+UuNOoX+w=; b=R/R6rhFV+Zit4MpZEk/e98Bo9JDL/B5qwNDUBmCm+RGmS9UheBFw8AsrGC1gAIr67D b0/JvCutnb6OX4CpWJ1AC/fqGP+Zv+NbopNRHRjhFBk4YxgulLq9ev//jiASbDxLkaVg pO0Rm3Biu2hMVzofJqBF4ts/W/BcsZzIUAwf+hAa8jbb8PqK0UEk7MRfZh3nqUVJU+8q MApuk0tvqreHjK7swFIG5w1aI/RGUxme7f8EJCBc1lKbGLv/l3K0rq8nnqjvF6zJO3/6 oXEY8Q/6pb+u2cI66WKqQdvjBGKNYqfuzpKkr5yk+qx367i0R6YR53nT0R+AQ+BArlJX kayw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p123si9116225wmb.21.2017.11.25.13.49.28; Sat, 25 Nov 2017 13:49:28 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 62D5268A313; Sat, 25 Nov 2017 23:49:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-2.mx.upcmail.net (vie01a-qmta-pe01-2.mx.upcmail.net [62.179.121.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B42E6883C5 for ; Sat, 25 Nov 2017 23:49:19 +0200 (EET) Received: from [172.31.218.34] (helo=vie01a-dmta-pe02-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eIiK8-0001LG-Ex for ffmpeg-devel@ffmpeg.org; Sat, 25 Nov 2017 22:49:20 +0100 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eIiK2-0004yp-Li for ffmpeg-devel@ffmpeg.org; Sat, 25 Nov 2017 22:49:14 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id eMpA1w00m0S5wYM01MpBCX; Sat, 25 Nov 2017 22:49:11 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 25 Nov 2017 22:49:09 +0100 Message-Id: <20171125214909.28947-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.15.0 Subject: [FFmpeg-devel] [PATCH] avcodec/h264_parse: Treat escaped and unescaped decoding error equal in decode_extradata_ps_mp4() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: lorex.mp4 Signed-off-by: Michael Niedermayer --- libavcodec/h264_parse.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index a7c71d9bbb..9216d0bdbd 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -427,8 +427,6 @@ static int decode_extradata_ps_mp4(const uint8_t *buf, int buf_size, H264ParamSe ret = decode_extradata_ps(escaped_buf, escaped_buf_size, ps, 1, logctx); av_freep(&escaped_buf); - if (ret < 0) - return ret; } return 0;