From patchwork Tue Jul 14 20:19:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21015 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 1C3F844A518 for ; Tue, 14 Jul 2020 23:20:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD73568A616; Tue, 14 Jul 2020 23:20:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E4406882F0 for ; Tue, 14 Jul 2020 23:20:05 +0300 (EEST) Received: by mail-wm1-f47.google.com with SMTP id 17so196561wmo.1 for ; Tue, 14 Jul 2020 13:20:05 -0700 (PDT) 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=MlB6GNz0Rmb88i+2ZPKT9fYiFw2tFn8R3GwjjEVOXrk=; b=Be30jjpr8MDS8LlIMAWI37QoEaaKiJmyEg4oVzYxC1+EdquqqZEVXPLKprbtAuQVcT /RHcwDFI8RPhFdHRN62mbXKv++kdHqoUAxoj2M5R+u4DYrwy9QvINru+92PHomg/vCIR Qu4UEjr7sbvAFkgkSI4UVivqsOH2P8Y6PbgLdeKuhd4eWEXNRd8jCtI7tCNffZaGpFRf rO8UrLV3zWywgJb8rQdOp9dnrEhrkJpRLvR4+G4bU6qtGx1GTXr1bmuLoW3BH9MlzUJd 2zbT+w7R4fPNv4vUrpCJ7UDBLhSP1HvVAxptdsp5JXJ5V8EmeSkdXH8QvPjy/RVBEbRg Va7w== 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=MlB6GNz0Rmb88i+2ZPKT9fYiFw2tFn8R3GwjjEVOXrk=; b=BiGtPilHIeND+SLGVtSKGIuTFbfWuYQxQovgPyQRU0fAMvdhqtitSTDtyTWs0E7Etw gjFI6PaGgCpRvaOInNuZPARBA+zH7qnBGmt2dfT5tCjxbHUw7FeSjdh3u+HI4udreEI5 Dssdfrx9WNPURVSoqPVp7SZShfLWhb1Vl6FJotVMfR69ClgfYs50KN2LV5Lpf7VHjuc4 G/tTWUKf0g5Thuaa51qn/wW1LqF8cX14EF/Udb7n5iJP87mR+uW+gtn1nLBSSCzVnErJ h5deaxp+FAxWnO0Cn3IQqQim3wLo1rOPy9ckfnQpU6VBHS7wPUY5HaXsUTY3vZ1xxfyX rlaw== X-Gm-Message-State: AOAM531nWJ0+DFtV1rzbYBEKAKXiqZflMVMwdBw298J1thBJEt7eAHTJ 99lr2poQ/CUpQNApl1jCoNs4rDfM X-Google-Smtp-Source: ABdhPJyXf9Maw5zNfnSgU+msYMDCSMGT/b8GzJ24FMJGvBzgAzILQgix0BDbAJo+xPii02BXV9DKEg== X-Received: by 2002:a1c:1f09:: with SMTP id f9mr5667335wmf.137.1594758003871; Tue, 14 Jul 2020 13:20:03 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id j15sm29462355wrx.69.2020.07.14.13.20.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jul 2020 13:20:03 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Jul 2020 22:19:49 +0200 Message-Id: <20200714201954.30327-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/6] avcodec/golomb: Don't emit error message in get_ue_golomb 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: James Almer , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Said error message is not very informative and lacked a proper logging context; furthermore, many callers already provided more descriptive error messages of their own. So just drop this one. Suggested-by: James Almer Signed-off-by: Andreas Rheinhardt --- libavcodec/golomb.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index 7fd46a91bd..1f988d74aa 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -87,10 +87,8 @@ static inline int get_ue_golomb(GetBitContext *gb) int log = 2 * av_log2(buf) - 31; LAST_SKIP_BITS(re, gb, 32 - log); CLOSE_READER(re, gb); - if (log < 7) { - av_log(NULL, AV_LOG_ERROR, "Invalid UE golomb code\n"); + if (log < 7) return AVERROR_INVALIDDATA; - } buf >>= log; buf--;