From patchwork Sun Jul 18 01:22:00 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: 28957 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3149350ios; Sat, 17 Jul 2021 18:23:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7TUiRSc6WWDpANxCj6ynrVLK17bLKxtxq0FnLn9dzU9FLxUoYaUGKNfxO+F/nYJBwQgze X-Received: by 2002:a05:6402:1657:: with SMTP id s23mr1988751edx.180.1626571389063; Sat, 17 Jul 2021 18:23:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626571389; cv=none; d=google.com; s=arc-20160816; b=WB6qbNNydB7ZyPlq9YOqUMqIT3v3b0AYinSEIBBydRko1FpngXTfiDtMWVRV6wkfEe pa3lA8GjPBAiAnurpWOVdHuO6Mses5nSi8X4eYvbY6sN+psK0HC+LONB3q/0NfSxlGox sazAzXPjJ1SFvnedTfe3UFUvfTaaeN+uRsQ1PfdRqNV2mfsVUfyzo5wWOoEWydyHfONB 0miZIq6F4Fp4fTMihzDRUBqWGR4P/hvI2m0ylTQq6PjZ7bCsmV975eHUbttJ4MgufdPg taCN3Eym29FAuYcSOXLSyHjtrWJOK6RJGe+I+QhX2Fxe4LfssyWn3Z59l5ibGhfKs4v4 LgGA== 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=BtCZcYS8ONqzTcE6dhbq1EfoHuyKhKNxDlyOrhuu13o=; b=FEFYrw8NbWr1bhVfjJSdnsEldojNCAnFjkwXAhjPDOwN0U20mAywoB/SHigF3RWq8n ZViZnquD9xfHfwjETkELGA3gatUG2SdybqeSMJi6p60wJMpgwTLXYRHxxpriHKtH9P8V EzmCJ3t5L+r5HLDs5X5jz9nVHPU9Q0kuIv1xloiUG+eJs6Ab3lc1dMGfMFFrZHDT+zjM 4FhX8SyCdX2EHG3Kvmcfc2AyF3NzFm9MwRVkEBQqoR/2mM7favAlA1/xfHo1KkQsrg1/ /W6kOL9MUmiWvx/oAA9n5P2DnWibdN5LWAGZ/MPbWDbXL3DEVrm1r0rc+sLXlZEAP6/3 HswA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=LP+bTRan; 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 oz27si605126ejb.250.2021.07.17.18.23.08; Sat, 17 Jul 2021 18:23:09 -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=LP+bTRan; 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 3BE0068A457; Sun, 18 Jul 2021 04:22:36 +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 CF8EB68A882 for ; Sun, 18 Jul 2021 04:22:29 +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=1626571349; 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=Cgj8Mfv63B1/E+Dw+ZYZY2bcEZKf0jBn3K93+Nm/KmY=; b=LP+bTRan+uThrh7r6OgaUtmCzJT0nG88r4inwNkU8+tmHeuWeDa6cy+X8INXD1WVLMGK81 D/JHNERqSB4gdsMvZUcRFGU3oW3kn6s1LhtrRPZlAO/YMGXDwLZPnxGBhlcv3+uPGHsX/V HSr/2nPBAKlntc4Y9dAhQgRuevNAXj2N4YPuxahbYOGn6sAPoTwy3FXKS6UwjEYWKsAIaH G47qMKM4X2Ab5NfK5oZAkVU8HHoAWRsbW+opJsZ1pCuCNUqFaB7Lk8MHPlLHsUolacuKxP tQ9LzpWIT0ZvWcyPOkS+Q6RvI+oa2N2ZPcOhVicVYQcOxfJ9IO55BTH9y+A2wg== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jul 2021 11:22:00 +1000 Message-Id: <20210718012204.97733-4-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 4/8] avformat/argo_asf: 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: lVmA1ScMqvUM Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index c3ac49fdc2..ef647ae20c 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -109,12 +109,7 @@ int ff_argo_asf_fill_stream(AVFormatContext *s, AVStream *st, const ArgoASFFileH st->codecpar->bits_per_coded_sample = 4; - if (ckhdr->flags & ASF_CF_BITS_PER_SAMPLE) - st->codecpar->bits_per_raw_sample = 16; - else - st->codecpar->bits_per_raw_sample = 8; - - if (st->codecpar->bits_per_raw_sample != 16) { + if (!(ckhdr->flags & ASF_CF_BITS_PER_SAMPLE)) { /* The header allows for these, but I've never seen any files with them. */ avpriv_request_sample(s, "Non 16-bit samples"); return AVERROR_PATCHWELCOME;