From patchwork Wed Apr 4 16:07:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 8330 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp5049765jad; Wed, 4 Apr 2018 09:07:32 -0700 (PDT) X-Google-Smtp-Source: AIpwx48Dtgn5AfA7XO/lFPjQg5OBMNRtKjlMYEBRBLmfQdhFUabwrYyxm3sO2xe2xH9E7H2oy2qL X-Received: by 10.223.192.3 with SMTP id z3mr12843158wre.177.1522858052472; Wed, 04 Apr 2018 09:07:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522858052; cv=none; d=google.com; s=arc-20160816; b=RK5xlYiDSqDX5qKjKBQkM2uWCz5nKS42ZOsYgAtztoepoBAQjcqgxMUYzMF548wxyZ wK7JkP6wF6sh4F/q35784w4Sxs0ku8aZTUBv+RHGQ/PoJ43B5EV1XMtZaVpqjumlvTjy BGww4W73MosHNFPPoynfAkDa+Oa6YqbEYCffLk+YftScme8J87sG8+kfdgHCkANtIaIy 8slGZXzl9c4ssTM+jdn9iTETdVodYYk62TcKHwjEoiA6WTp7nng5vWpPq0EABqjyeVAt 1JVZ11bSIv5QyS+zP3rxARHKenvg1w1mR06I4khn5lF1huTb0MX8hi/oAMgtP7pMV8Mr IyaA== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=g2W+ceePGoMmqn8DvuittVWtGmIN4kGxMSLbqHOitnA=; b=t1URt6cTsuSK3w3aRksf4dKsm3TGLonh+XhPfvHe5adoF84NLFoomBX7pvwdujRiUv CvoC1gmJHyg7wFtnVx8/eUuBLRqPG6iQo6vnrwuCmP3J+OtzK+ZMO0VuVAqVXxRevfLQ D0TP/vGkJa/xcNpW8oMlxLfAM2ZP+HkbEB6ye3Cris0/7HVgmeHFDFY6PmWBcf8AOd69 IlpRPUQbVtEok0r1Vhg2tr1vO1xXX5YtRReLGkFSpyzQn1DJNEfbkuEFVUObM/jJvKo4 v29hczfBYCxxi8Y7tYk5f6aqGI4M6XaLM6e/4HOwWEcwF8aScEPVotfdgCNCQq7vpCFR 7+UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=khP7ZNUx; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i66si2515892wmg.180.2018.04.04.09.07.31; Wed, 04 Apr 2018 09:07:32 -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=@googlemail.com header.s=20161025 header.b=khP7ZNUx; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6AE16680636; Wed, 4 Apr 2018 19:07:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com [209.85.128.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 940EF680164 for ; Wed, 4 Apr 2018 19:07:02 +0300 (EEST) Received: by mail-wr0-f174.google.com with SMTP id y55so23596928wry.3 for ; Wed, 04 Apr 2018 09:07:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=q+Sc2Q7NmF3HRlchiIyXPnsubPSNupEazOvWzaWzmis=; b=khP7ZNUx9Ux72XveMDsDtRMveIZN46dTTUpuM1dmQT0aM0WIvT5wdsiqGCoxIziEhA OCp5Y0D1eUjGYBqhQRQnfS5lv/4H2gLnyU97/n+mPw3rITvlRe6yhqEo7gHX15wdqnRQ u3YcIWZkovaQBvS2hnSALIzPFuDs3eE4LzrJ1uliQFe/mSIQ9IHxxRu1NPxUekrx3CLy SzxLansMFqvxGduqXYXrVvA8dujY6hk/yCxiVDoGJ4OHTErXLrWoJuEWX1bC1bEDBbSp mrZ23vhdn6vA7gT/t3t0T1duQfsV9RprFHpgq3TmzEvZLBa0GM7S0eFWjoC5EQN7AVzm ITvg== 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=q+Sc2Q7NmF3HRlchiIyXPnsubPSNupEazOvWzaWzmis=; b=HAupeIp0bXxYrKwfSZyXelsSTSiu3xoMVeUh/K02bccQ5sFQEVYkG3si8JTVX95PFG CT09btJOnTgCucDmq8+hL4xyI8h8ZufWKhi2Ks6xspGtiypXXxUbIoBbkJic7jsLXNvX P0iq/SSO9SesAyzbj25gY1Fv/sU33J1VPLMSLCGfuPqHcLWIc1GlFjEQzhoQc2s6fxfX lI1Lx2T+XRcD13jaDavVDZo1/9eBuQN/poIURM2wIW64rNbde3BIuMhL6BR0vFWLYQkb SAB3AItAsmKa5jBHjjN0Z8QDcUH6egH6hJGby8dq/senlVec/GYIDZ6nUfTVlslW2A8B yjxg== X-Gm-Message-State: AElRT7HYX3Df0b9DaysbjEElm0q67q+XbBgpvl1fq6jv9HZ/5xne1Y3/ erS80cwlIfoxtgDLNOJcKZWrSA== X-Received: by 10.223.150.56 with SMTP id b53mr14710854wra.79.1522858043001; Wed, 04 Apr 2018 09:07:23 -0700 (PDT) Received: from debian.speedport.ip (p2003006CCD4EDC955D9ECE0527625203.dip0.t-ipconnect.de. [2003:6c:cd4e:dc95:5d9e:ce05:2762:5203]) by smtp.googlemail.com with ESMTPSA id e27sm10468310wre.86.2018.04.04.09.07.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Apr 2018 09:07:21 -0700 (PDT) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Apr 2018 18:07:20 +0200 Message-Id: <20180404160720.27763-1-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.16.1 Subject: [FFmpeg-devel] [PATCH] avcodec/decode: fix warning when decoding pseudo paletted formats 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: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The pseudo palette allocation is optional now. But if it's still allocated (like the internal get_buffer2 implementation does, for compatibility), it shouldn't print a warning. --- libavcodec/decode.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index d883a5f9fc..421a8f1a35 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1779,6 +1779,8 @@ static void validate_avframe_allocation(AVCodecContext *avctx, AVFrame *frame) int flags = desc ? desc->flags : 0; if (num_planes == 1 && (flags & AV_PIX_FMT_FLAG_PAL)) num_planes = 2; + if ((flags & FF_PSEUDOPAL) && frame->data[1]) + num_planes = 2; for (i = 0; i < num_planes; i++) { av_assert0(frame->data[i]); }