From patchwork Mon Apr 3 01:45:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3255 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp2984632vss; Sun, 2 Apr 2017 18:46:37 -0700 (PDT) X-Received: by 10.223.133.1 with SMTP id 1mr6671485wrh.111.1491183997446; Sun, 02 Apr 2017 18:46:37 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o51si17851188wrb.203.2017.04.02.18.46.37; Sun, 02 Apr 2017 18:46:37 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 247C768831C; Mon, 3 Apr 2017 04:46:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60CAF68826B for ; Mon, 3 Apr 2017 04:46:10 +0300 (EEST) Received: by mail-qk0-f196.google.com with SMTP id r140so6331123qke.3 for ; Sun, 02 Apr 2017 18:46:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=JexjJnK0k3uPhMmX7D1fMlS7WkjSeE8xMcioOClJ1dw=; b=O/NAoiY1tPsLyC86BIxYlKod23caspe8jYswY7eJC1vBmDhkdBjLM9sg8FcDUo6/+n b5nt7bRZm5wiH+OtXEqtxY99AwqUbEqXqUqMIRlKYvGLOVhWjxr/UCzfnA+UiDiYKzce dzKVrjyavPRScY0DrGmfk0Em4dcqqhDTRL520SNbdnd8Ebd/FrXEek+60+exRuGpsLBh NNLjd34boZbFLYR+uHfQYfJVhlrCN3SIPFsmbtVQ9cHdXcXI8yTd5lin1kdCSgqrwr40 En7/qSX+C/wH/K9GUvsMQLlZVNwNinL8loRzCtP7Of3WDRrI5JiKB7/tKlZnyyTqZNd4 f9NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=JexjJnK0k3uPhMmX7D1fMlS7WkjSeE8xMcioOClJ1dw=; b=kk6gaWxA63poOc2PAIHYIwmkUq/s/MqtsfuKtC3DdWXsbUPtIA7NRvb9ekN/tOGs6s yoV9s2hrxwFiJuW7NSYaMgIAxrDU6Fva8oU8sA3rXU1JEqIc7jayZ46gkm3GUn2HNcM8 QIs/JBtABiQiIpyOOC81Ws2E/K+oPLsF1GD0mVv/zglHJZhOH2CMzU7nl1S4RGlN3ylJ SwDWZoBUZWe8rjmVTR58VxE0LQgWp6LwzDkmafQhFCeaX2d/LOcT+SJx0KD4Z8HTnbnc eri14w6ZnmNnMxRd8R+hlFh94pkL/X2YsfrIhV9fJfRLTY5n6rqFjonQejWY49Nma48W 5dfw== X-Gm-Message-State: AFeK/H3+qRHTJq4sqrJwCdOzj3fXeKKqG55spSNifGZhng8G40ZIXQPLhpycUzzMBimN8w== X-Received: by 10.55.6.83 with SMTP id 80mr8838340qkg.156.1491183970806; Sun, 02 Apr 2017 18:46:10 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id n19sm8645200qtn.35.2017.04.02.18.46.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 02 Apr 2017 18:46:10 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Apr 2017 22:45:43 -0300 Message-Id: <20170403014545.3704-3-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170403014545.3704-1-jamrial@gmail.com> References: <20170403014545.3704-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/hevc_parse: ignore all non parameter set NAL units in extradata 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" While they shouldn't be present, they are harmless if they are. Signed-off-by: James Almer --- libavcodec/hevc_parse.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c index 3b817c4f4d..ee4cd54d3e 100644 --- a/libavcodec/hevc_parse.c +++ b/libavcodec/hevc_parse.c @@ -54,25 +54,8 @@ static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets if (ret < 0) goto done; break; - case HEVC_NAL_TRAIL_R: - case HEVC_NAL_TRAIL_N: - case HEVC_NAL_TSA_N: - case HEVC_NAL_TSA_R: - case HEVC_NAL_STSA_N: - case HEVC_NAL_STSA_R: - case HEVC_NAL_BLA_W_LP: - case HEVC_NAL_BLA_W_RADL: - case HEVC_NAL_BLA_N_LP: - case HEVC_NAL_IDR_W_RADL: - case HEVC_NAL_IDR_N_LP: - case HEVC_NAL_CRA_NUT: - case HEVC_NAL_RADL_N: - case HEVC_NAL_RADL_R: - case HEVC_NAL_RASL_N: - case HEVC_NAL_RASL_R: - av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit: %d\n", nal->type); - ret = AVERROR_INVALIDDATA; - goto done; + default: + av_log(logctx, AV_LOG_VERBOSE, "Ignoring NAL type %d in extradata\n", nal->type); break; } }