From patchwork Sat Feb 8 22:20:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 17730 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 658C544BBD7 for ; Sun, 9 Feb 2020 00:20:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4582E68AFDA; Sun, 9 Feb 2020 00:20:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14AE068AEBC for ; Sun, 9 Feb 2020 00:20:43 +0200 (EET) Received: by mail-qk1-f171.google.com with SMTP id v195so2827242qkb.11 for ; Sat, 08 Feb 2020 14:20:42 -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:mime-version :content-transfer-encoding; bh=CnmXEcnO14dPvHTZSqN2aPEfkx/7HCUdM7WtZmBMTHw=; b=vE8FCUk0N8IfQAIxHwcNYV44JdhOs6WK8S4gF7IlR3yIL9umXJKfFWURn/WBFeeXTm 8+Hop1OJMhdOLC47In3JQEuIxPRpbHpY+z4AiLHtahPFD5g7m9O9umoZI2m57vJNkrkj ZdGFSn+/PXpy+aG5IPozPP5CxsfzymR1vKLWsnSv6ZU+2TmhPXHyMG85oTSs100VkudI K8QZ5LYk8arGsh9Z/rt7Ky5fXhKAXAjLX5ZOiggpCMn24Ft0V0qDP0+d+UjcaNSz6PQz pViQCcKMCtm1Wak7UE3Rrwtl65VpKhLtaXLPsuinh48W64W1KhEE/2GiuqvhBFEmFhVF i7fQ== 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:mime-version :content-transfer-encoding; bh=CnmXEcnO14dPvHTZSqN2aPEfkx/7HCUdM7WtZmBMTHw=; b=L3KtlzQoPl5+rh0wuC7w0lUgFuY85e/4nOBiefGLMQSio9/glMx5eoLAfcA2epcII4 JBISjiKTfakFqwn43KR4X96Snr7fa51kVxasC5zRpy49e4bzXShLjQOX1QgflP2hwyRF wkGPMMo1nJSsFH/4Ij2E07ee9a+pOUkzHx572Lfwan5v4GQXx3AL5znvToEmBMwDVABk 0XolKX7GAeM6Jonbr1JZppv/1/nSYlzjb55v86LfFRaOxcyaoAqkjV+huv4NNC+h3RuC iEGXzmncdRjJiFWrSThNLX3rNY4EIjYC4d+6q5sGB/LwAN1hNl5DhsvWsCe3b8nuUwJN a+/w== X-Gm-Message-State: APjAAAWMOGCvMoSAzoK99aizUIsal9p5LQsfFUyd778TrzqMzwAkJgYY 30/cz/sIItqyHV6YGme8+GUVg733 X-Google-Smtp-Source: APXvYqzIq+a9FDeN/G9pxRKPw6bXOnmulvE1r3oo7/f9NEceKJxAMdxHeicT07UoISptCdRpQVk+aQ== X-Received: by 2002:a37:b82:: with SMTP id 124mr4943560qkl.18.1581200441527; Sat, 08 Feb 2020 14:20:41 -0800 (PST) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id l17sm3458025qkk.22.2020.02.08.14.20.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2020 14:20:41 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 Feb 2020 17:20:29 -0500 Message-Id: <20200208222029.7966-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/h264_pc: Return error if pps has FMO parameters 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman FMO is not supported and fields related to FMO are not parsed, meaning that any fields which follow will be corrupt. --- libavcodec/h264_ps.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index edbaa96b64e..80216854079 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -794,6 +794,8 @@ int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avct if (pps->slice_group_count > 1) { pps->mb_slice_group_map_type = get_ue_golomb(gb); av_log(avctx, AV_LOG_ERROR, "FMO not supported\n"); + ret = AVERROR_PATCHWELCOME; + goto fail; } pps->ref_count[0] = get_ue_golomb(gb) + 1; pps->ref_count[1] = get_ue_golomb(gb) + 1;