From patchwork Tue Apr 9 18:32:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 12663 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 F0EC8448432 for ; Tue, 9 Apr 2019 21:33:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CE1D268AD73; Tue, 9 Apr 2019 21:33:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 261B168ACE1 for ; Tue, 9 Apr 2019 21:33:11 +0300 (EEST) Received: by mail-qt1-f196.google.com with SMTP id z16so21058906qtn.4 for ; Tue, 09 Apr 2019 11:33: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:mime-version :content-transfer-encoding; bh=dnxJgnqz20HE/T7PMjIzAvA9iCSUdE7buVMvejUVAYI=; b=gfoVdHopTebxnNC3/8gXVEgUvbfZAOoeoPwc+p+msjeUMU9MtopEpZDy2FM7b0Bwao TLavoVcPY5UKP29GmFoSY2bKPYvhj/meE5FD86KrsYIT3VNQc+dtsQ0j0Gdm3QbBhIBL +3u6mdutCZWLxlLI12W3tRZC0EQRhr2LJ/7SAKhWJMB/ScvzVtxC9mmk8X+phiCeSkBo MUT9UI01SQZJCNac3j3Q8/wdqtnHai3+MOI6J5YJa3NUdqTdyrnrhTuH6KTklOpLchh8 jtZ/tueTfaPlqvPpWBEd6anmqMzO41mxmoK+X9rAGC0W3Sy3KSk5yV3w/06AgjHDsqPS GE5Q== 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:mime-version :content-transfer-encoding; bh=dnxJgnqz20HE/T7PMjIzAvA9iCSUdE7buVMvejUVAYI=; b=n59yrcVJc92O3eoi8G+FsCyLp2SMfaSdInb5b0Ghcljf38es1BSfO2HcW0y+evynrr Ql4WEfkP6fZ3uZYaJyK2guG0CEd4q9h9LrHmE4Uuy6IhROacoidkD6J3vjxjaLbK9Vse 7NQ6uzZqfo1ZV1WBwnPOB8hMFaie4nzr6ziowpNi7xtTAh7y30P+HW5B7p4wQehRrz// ObchfrbzUPpy00cnu0f6e2p4SO21ahiuPsOk8lTJq+uSsvMycfxsBKR187rt+i9+fG82 0B213v4sF8DqOEZdDdRNpbRoDFzKrf+adPDQhNRfwWkSrUPeX28ylG0svA48FNEZIez9 LYLg== X-Gm-Message-State: APjAAAV48aZxHxp0hEHLAy3SUJA5eHK6FIgIykQ30O71dG8ikMdEnrK/ ZwKWWg66lcIwDC4QqNvL+eNArMfa X-Google-Smtp-Source: APXvYqxpH1c61p1c6QhadLpcy3/PDR3jPuFrH1nPhH9soT/befgXXbjesDBRNrk6f418q5oLmrwNWQ== X-Received: by 2002:ac8:1846:: with SMTP id n6mr30619659qtk.262.1554834789614; Tue, 09 Apr 2019 11:33:09 -0700 (PDT) Received: from localhost.localdomain ([181.23.83.131]) by smtp.gmail.com with ESMTPSA id f20sm21487459qtk.14.2019.04.09.11.33.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 11:33:09 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Apr 2019 15:32:25 -0300 Message-Id: <20190409183227.7680-1-jamrial@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/h264_parse: clear invalid luma weights in ff_h264_pred_weight_table() 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" Based on commit 85c85fffff3f9c75301db3eba1bd5f2fb1e6285d. Signed-off-by: James Almer --- libavcodec/h264_parse.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index a075443d17..8bdd886000 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -62,8 +62,11 @@ int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps, pwt->luma_weight[i][list][0] = get_se_golomb(gb); pwt->luma_weight[i][list][1] = get_se_golomb(gb); if ((int8_t)pwt->luma_weight[i][list][0] != pwt->luma_weight[i][list][0] || - (int8_t)pwt->luma_weight[i][list][1] != pwt->luma_weight[i][list][1]) + (int8_t)pwt->luma_weight[i][list][1] != pwt->luma_weight[i][list][1]) { + pwt->luma_weight[i][list][0] = luma_def; + pwt->luma_weight[i][list][1] = 0; goto out_range_weight; + } if (pwt->luma_weight[i][list][0] != luma_def || pwt->luma_weight[i][list][1] != 0) { pwt->use_weight = 1;