From patchwork Wed Oct 14 13:10:50 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: 22945 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 D29FB449A01 for ; Wed, 14 Oct 2020 16:11:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B991868BBFE; Wed, 14 Oct 2020 16:11:08 +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 BC38E68BBFD for ; Wed, 14 Oct 2020 16:11:01 +0300 (EEST) Date: Wed, 14 Oct 2020 13:10:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1602681061; bh=jIwnCCvlGO+1oJh0og/U4T2zmdRwpdOFyo0CDjcToq4=; h=Date:To:From:Cc:Reply-To:Subject:From; b=lyW1fYhQPBKvjG5t4kBtWmp7iJdrEH0elUBi0ZwvTz8vWnCgFMTJmpwVSgTOVbA8Y CyvEO3EsUXLzZ5uiDVPdGa4StFdhG5z2ub6I3lSOZM++LeeGNL7vPHDV0gw990+NkG eEQ71Wepp0IP1x25lvnAh8WSMr6GSy9FJUhOAX9xNckXay30pKUZz/AZ6jizzD4/D1 Il3uKOClA4SAZ05Rpgv0Ia5Ud8s2QpuQW51YdbigAAQ+A7ncQQi+OYo9K+oj7EoQZl NiaSkmKggQsBJohTR5qgmJU9BUPp/MNPkQa75u8urRlrTLWuzN+hrLFjIba5cSQ8EJ sPNv/UMK5k8mw== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201014130915.25948-7-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=10.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 mailout.protonmail.ch Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/adpcmenc: remove BLKSIZE #define 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" Signed-off-by: Zane van Iperen --- libavcodec/adpcm.h | 2 -- libavcodec/adpcmenc.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/adpcm.h b/libavcodec/adpcm.h index dc0d49ac61..0ffc3da1d0 100644 --- a/libavcodec/adpcm.h +++ b/libavcodec/adpcm.h @@ -28,8 +28,6 @@ #include -#define BLKSIZE 1024 - typedef struct ADPCMChannelStatus { int predictor; int16_t step_index; diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 83c7e7ee05..bb59cb9849 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -857,7 +857,7 @@ static const AVOption options[] = { .help = "set the block size", .offset = offsetof(ADPCMEncodeContext, block_size), .type = AV_OPT_TYPE_INT, - .default_val = {.i64 = BLKSIZE}, + .default_val = {.i64 = 1024}, .min = 32, .max = 8192, /* FIXME: Reasonable upper limit? */ .flags = AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM