From patchwork Sun Jul 18 01:22:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 28963 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3149496ios; Sat, 17 Jul 2021 18:23:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPxz1NgzLLqM2lseHfo2P3L0i/bNfN+gcKCKttX2jS2vfEUsT4pRI42V7TXX7bMU4HEChU X-Received: by 2002:aa7:c39a:: with SMTP id k26mr25770799edq.24.1626571411039; Sat, 17 Jul 2021 18:23:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626571411; cv=none; d=google.com; s=arc-20160816; b=kr1Yzq0LPKlF2vtzsEquMGh1a+M4uwyo82G7HxJJPAyUdyIf+Dg8erut8Tx1/7sSRr tjuATqVmKMcY45iMwW624Y/RtniOltC0SJ7tcQy9u9czJ/nUW2SDfX/qypkkqoJIiMU6 CLBflBRspDZQS/Sbwc1pkExmxb9HD7+PcfZNPk7tQlSZBYwFqS8LGxB0XsUHBuo8bFau zyZo2sz2P2Q+YmVs+TTBw8pY53xoFn1d4CkPQqb7jvTZ3fRUfme/Z3Lq9ERztD6GS6Po PsznILs+KJwKstqgJWocOwLY+YL5L0M1hPpYHvRzeuo2fpmNrSQhMzN/rv3GLLJuGWUK gPzg== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Zxu2XvllK+DRNHWAdiS30rUvDb8WqRclLV/mO6u+nnk=; b=y/49qcLwxBUHZzTyBh9gAzT0Mc3FelXLvE9ML8EjTH/v6l40WFNCW3dBzVcWmDPKDA thivB1aNijaKV+7bGqyMgAcDhF1a7f1cKMU+/N55bVsnd9i7vQr3BSFOTACBC9Tq2ExE CKnB5l0P2JnhzCX/FQdu5LtUi6r8EkyacMtZ+aq1nLAXvUTotheAcbk2YJPLX90mkRXj ELZlVSCNeHk3u+BRhreFvdcgeXordxzqvh5MG0Rfj12FmbrgZrwIBLAbp3nyanwwc3dq O/aVihd3AaeGkIcZhCtVhS6qVNUB2ptGbFIS2xUHVceP6pfhINEscn6UOoz0RZCjVkkA 501w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=T9Aeot6Y; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c11si19062409edy.282.2021.07.17.18.23.30; Sat, 17 Jul 2021 18:23:31 -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; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=T9Aeot6Y; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 682E468A8F3; Sun, 18 Jul 2021 04:22:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FF5A68A8F1 for ; Sun, 18 Jul 2021 04:22:33 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1626571353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9VJyhuaVPZoAl8wGhr5Gf+YeHnraOQnZwFtw8vwgWzU=; b=T9Aeot6YhLzGgjqvzLa0zVZM3vTztumtIjt8+VGnFyg+GN9RrJYuq0HXfby1f1W7dgGy+5 5n0Pmra3wLdu8LMKaCBawuVOsWSCqEPnw0U9YuPrupNLqejydYAokwpe5PZZMDuwRurbL3 M3gxSgA+m2r5555ZyNn2UKpEImdPOJOpD24y3gi4mBaCmfeyEdOafmAuYI0jfiOK8qVoMp jdG+r3qaj+nMtvf2omL3EEdR8HuYp7HrE5ZPJLQtTw50s/LvmSYex1WMEx6DGXKfNZ0/sj CCCx7QORpnXYxYPWXhzw03WbBo/3d/BvCdDRFdZ+itFfm0AOFhslmYhzxgtauw== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jul 2021 11:22:02 +1000 Message-Id: <20210718012204.97733-6-zane@zanevaniperen.com> In-Reply-To: <20210718012204.97733-1-zane@zanevaniperen.com> References: <20210718012204.97733-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 6/8] avformat/apm: don't set bits_per_raw_sample X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: EE/BplHOcNwu Signed-off-by: Zane van Iperen --- libavformat/apm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/apm.c b/libavformat/apm.c index 6ae53b8712..6a047c5095 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -146,7 +146,6 @@ static int apm_read_header(AVFormatContext *s) par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_id = AV_CODEC_ID_ADPCM_IMA_APM; par->format = AV_SAMPLE_FMT_S16; - par->bits_per_raw_sample = 16; par->bit_rate = par->channels * par->sample_rate * par->bits_per_coded_sample;