From patchwork Tue Oct 3 13:50:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ingo_Br=C3=BCckl?= X-Patchwork-Id: 5399 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.61.8 with SMTP id n8csp2742682jan; Tue, 3 Oct 2017 06:51:36 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCRTfpGq0a9U9uAdTwHviqSa849PTKgRdyMeues/2uDA5mqtzedAiln0Fv+azpgWOExqLmb X-Received: by 10.223.171.15 with SMTP id q15mr412090wrc.23.1507038696192; Tue, 03 Oct 2017 06:51:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507038696; cv=none; d=google.com; s=arc-20160816; b=qyXdEvf7LqHJtwsYq1wpDB+yi5xKplk1RkcRyJ6n9YoaGT/AsXcuR7s81+rNaqmTTL KH1563akbkfJU/JTpIc5RERgAGidLKKBufH67UyxAZGdAexSZcfbwosXptmE3HPaOEg8 ATGCTfRqt0aJSiwMyov+9iXuKLfPj8LMmZDvzq5Eg0hETReHaV7J25ybyVCxdvdUlqNq Y2F5DUqVCekil76xT4LMqNinQ3LrnVXzFpgwIm4Q5oTEYXxYNnPPqSuPRf99vdLjXM9M hIKNW/0g9COaZU+1H9WpsYW8pdkwY5Qfpy5NUU180IKnGPNpZsnpSGYy7M0WnB6kT3fz MFsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:date:to:from:message-id :delivered-to:arc-authentication-results; bh=P+I9GdH5vt4bgeE7jD2Nwmx2mxVNNnAV/wqOBYTkBuI=; b=e0jxVaEY/8URrOvL7soWm53SjBGf1St1tFSNxKV4dpyGkkimHONjvtilqg59UJYuMf Bdnc2ebaFo5RCthgS5YCO2XQ7ZU8P8a2sWY4dQ0BK0a4kZwt/8TN2NYDCbbIfzGnoqfU tVtbYFuIwK6Y+HkzdzxiywElZsAbiFBljk5+ra55afq3of5woaH/fGcEiv+fZiFcbejd mYXJJ07KlqoVTI9MO1rhGdzv7y/1hkiyG/bAsI21OW2uQJuhNnIPSMmLqzWvi6JlWFwU VZ5kHjjsBd25VM7a7qKWD+Gz6AOFZPvnCIvz6UENpaLoUBScV+4y6UuZOZi/v8Tm6Cn3 DW3w== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u16si10488769wrf.4.2017.10.03.06.51.35; Tue, 03 Oct 2017 06:51:36 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CF4A468A046; Tue, 3 Oct 2017 16:51:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from moutD.wup.tal.de (moutD.wup.tal.de [213.240.144.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC36D689E6D for ; Tue, 3 Oct 2017 16:51:13 +0300 (EEST) Received: from point.localnet (i5E8668C9.versanet.de [94.134.104.201]) (Authenticated sender: ib@wtal.de) by smtp.tal.de (Postfix) with ESMTPA id 5D5EF8013DAA for ; Tue, 3 Oct 2017 15:51:28 +0200 (CEST) Received: from ib by point.localnet with local (masqmail 0.2.30) id 1dzNbc-77K-00 for ; Tue, 03 Oct 2017 15:51:28 +0200 Message-ID: <59d395ae.1adbbc15.bm000@wupperonline.de> From: =?ISO-8859-1?Q?Ingo=20Br=FCckl?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 03 Oct 2017 15:50:37 +0200 MIME-Version: 1.0 X-Mailer: blueMail/Linux 1.5 Subject: [FFmpeg-devel] [PATCH] avformat/mp3dec: Fix definition of MIDDLE_BITS 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" The number of bits from bit #m to #n is n - m plus 1. Signed-off-by: Ingo Brückl --- libavformat/mp3dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.2 diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 0924a57843..a5c4f2ea12 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -142,7 +142,7 @@ static void mp3_parse_info_tag(AVFormatContext *s, AVStream *st, MPADecodeHeader *c, uint32_t spf) { #define LAST_BITS(k, n) ((k) & ((1 << (n)) - 1)) -#define MIDDLE_BITS(k, m, n) LAST_BITS((k) >> (m), ((n) - (m))) +#define MIDDLE_BITS(k, m, n) LAST_BITS((k) >> (m), ((n) - (m) + 1)) uint16_t crc; uint32_t v;