From patchwork Wed Jul 29 12:14:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 21365 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 ABE3744BB23 for ; Wed, 29 Jul 2020 15:14:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 85CA668BA3B; Wed, 29 Jul 2020 15:14:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.protonmail.ch (mail1.protonmail.ch [185.70.40.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91C0068BA25 for ; Wed, 29 Jul 2020 15:14:47 +0300 (EEST) Date: Wed, 29 Jul 2020 12:14:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1596024886; bh=O10vQGA9S/DjfzTR/KK5KRN8pHXMAWh0iS1jjUE3xnI=; h=Date:To:From:Cc:Reply-To:Subject:From; b=QiHEZl3UAvy/czNPt/eoLVxo+57U5DXiQUGoJwG5eELbZd17RRPa0ZBJWnxgqrABE aiOjrFa/1nfS7F1/B+dWXUo8+ym+7CWl0n89AL40zub7Wzpn8zBojKLGoWelAtYTkA T/18nIakrxNYqY/AoMQie/2OVmBhXtFmHHx8J+A0= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200729121421.945299-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH] avformat/apm: fix APM_FILE_HEADER_SIZE value 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Value was incorrectly changed in 3bf1be210150b435c51c7c8eb8fd05a1fca08814. Signed-off-by: Zane van Iperen --- libavformat/apm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/apm.c b/libavformat/apm.c index 4c5844c83e..38a0f6382a 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -26,7 +26,7 @@ #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" -#define APM_FILE_HEADER_SIZE 18 +#define APM_FILE_HEADER_SIZE 20 #define APM_FILE_EXTRADATA_SIZE 80 #define APM_EXTRADATA_SIZE 28 @@ -287,7 +287,7 @@ static int apm_write_trailer(AVFormatContext *s) int64_t file_size, data_size; file_size = avio_tell(s->pb); - data_size = file_size - (APM_FILE_HEADER_SIZE + 2 + APM_FILE_EXTRADATA_SIZE); + data_size = file_size - (APM_FILE_HEADER_SIZE + APM_FILE_EXTRADATA_SIZE); if (file_size >= UINT32_MAX) { av_log(s, AV_LOG_ERROR,