From patchwork Fri Jan 5 09:06:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: misty@brew.sh X-Patchwork-Id: 7137 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp546354jaa; Fri, 5 Jan 2018 01:30:45 -0800 (PST) X-Google-Smtp-Source: ACJfBosgVCOgL/6gfZ7Ot7rnsai5d0Ij1zlpv+k4ULZit36GcalfD4FLuSsv6RD1goXHiI+BkGKm X-Received: by 10.223.176.81 with SMTP id g17mr1198129wra.131.1515144645551; Fri, 05 Jan 2018 01:30:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515144645; cv=none; d=google.com; s=arc-20160816; b=bIqiuK9F0divUPA49myO/p0g6Tnxo4fw4HXQrOpmo9M5z6kfwvRCk28bZkBk2H5QaW L2TXkxlFk8oD6EZ5NtBgWU32L3Cq4epPFIPsIaDZvyVJEqBgu0/1ZhgLt9RQfshMR2dZ xOATg+rpxFh7G1Kh8qMZA6lZDJzaOSEKGQELggNc8ioGZI+7hxo6ZP4u7FA/nFSqmmGf wBh8DueH5btfQLcTf+HgtXx7fBSG7n9pusN9Z8CnrAj9nWD+hOFlEyIQcVQaaj6HyqJV FyXm9Zk1gibsV7TS9GSf/FBPtR6tfVW+puSDNSu0+Nr2AQ8HgTXB2wzO5s/w/fMH3QsK iTyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=SX/c/s/Gs6DF5UrckyKEyO+T+DWJjyvG8HBE8XHV19w=; b=OsIWsBVLtqYpGa3kehC/Icj/F9vZByoqyQK5dva5LdsoVau2K136DCv+N3pMPjY5MU zYvx+ifNoqdSM2iRHpPqn9DdH08Cw16LFHr0RI6DHjKEhq1AyUnb/bF+Hsj2eZeMxIcM sLu+pcsdpncGT+WUuI1O7O+hWgHIRGgoI0XA5vtN6UxfyTUmQSJ5gt84pHRgP96IbXk0 kkuoVAdugV1CGP/SszN7FNiQEwUHsQOpDLBHR+9BP/87mrqiwU81CJKvpq2ZrnbmqSVE f0Ca9S/0b0KaHBiULgxMbeMkCRCYM2FEEbjNobKD5fg5OIb6HrryMsLLX5MJGju6ih9F LxEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=oKRTx6HG; 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 l127si3451250wmb.121.2018.01.05.01.30.44; Fri, 05 Jan 2018 01:30:45 -0800 (PST) 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=@gmail.com header.s=20161025 header.b=oKRTx6HG; 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 1DF6668974E; Fri, 5 Jan 2018 11:30:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E62C680623 for ; Fri, 5 Jan 2018 11:30:19 +0200 (EET) Received: by mail-pf0-f193.google.com with SMTP id e3so1981742pfi.10 for ; Fri, 05 Jan 2018 01:30:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=M6r2/KCyPlWXuCgXRC7+kJN8JGX2ntszlJbCP8xH7Ww=; b=oKRTx6HGgcmyHsJBgsxrNESAmsiv8U4dUTQ2pbyH3gSMAOmz6Z/tOvXL4y8mUB8dFD GI5pjvI/TmQ+8gA3zMOxRrMucwbKs7bziDNAvRRPTLCRdzCijhZNLmOwyxJGd/THxCzx +UWp+Yu9LphCq1pbnx2RQSsMA00PY9Gv2mKvwfHypI7gTOBW96QB0XaajOOppnZuh5qd 31e4WDTrB+q8Y3F9Bt/z0phs0pI7kPwaaxbPW2CI+PKxFF/UfzRzdHjq3jc8ZKvjYiTC UFEXX0I39RLz95a+Ow+ijorJoIObBlSj37eKPF6MnSEwpddP20T38rZfiWhSFdYKp3yi 94Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=M6r2/KCyPlWXuCgXRC7+kJN8JGX2ntszlJbCP8xH7Ww=; b=kVHRawfXgb4Sr9JZyAKaQzPyQ74lqKq2tg6/p5UMFcmWeIYPnzlJllHrff0kARVUdB XHar92Wc+5qTmCQAOPLx3Nf1kRAtBabdisW1mBZ+f3f4Rmaez9j4odDPuPrp6G0gEzQK QIgsDDo4f8q6PT2oOMVWYK2UCQoGlGf+5/euB9B0GM31NMAAZcxyefKCvtTOs2iIWYyV QX0q95a/y14IAPJqIdyvjkPl6HHypUkjr9FybNkMlRuto6wX6oqhtcKp6Aj78Z3KJnCW QzM6JT4jjVlH7BRqu38UiU+mf5L2xMTP0OKrBS89rs94nIMMIPBKk1UNt2kbhZAITF5F faPQ== X-Gm-Message-State: AKGB3mIsR5eGvnRFzqavJyKKkC60ZmtF9wCI0JqIrQ6wrg1peE7C+Cro W84nsrfEjsj4/Ye7zFGKg542fUnL X-Received: by 10.99.100.71 with SMTP id y68mr1930601pgb.71.1515143227081; Fri, 05 Jan 2018 01:07:07 -0800 (PST) Received: from localhost.localdomain (180-150-45-216.NBN.mel.aussiebb.net. [180.150.45.216]) by smtp.gmail.com with ESMTPSA id c184sm10944306pfc.8.2018.01.05.01.07.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Jan 2018 01:07:06 -0800 (PST) From: misty@brew.sh To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Jan 2018 20:06:49 +1100 Message-Id: <20180105090649.76346-3-misty@brew.sh> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180105090649.76346-1-misty@brew.sh> References: <20180104203901.GP4926@michaelspb> <20180105090649.76346-1-misty@brew.sh> Subject: [FFmpeg-devel] [PATCH 2/2] aiff: add explicit goto got_sound 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: Misty De Meo MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Misty De Meo --- Changelog | 1 + libavformat/aiffdec.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Changelog b/Changelog index 3d966c202b..63007a259d 100644 --- a/Changelog +++ b/Changelog @@ -33,6 +33,7 @@ version : - deconvolve video filter - entropy video filter - hilbert audio filter source +- aiff: add support for CD-ROM XA ADPCM version 3.4: diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index a6c180fc8d..e87fbc5661 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -332,6 +332,9 @@ static int aiff_read_header(AVFormatContext *s) /* This field is unknown and its data seems to be irrelevant */ avio_rb32(pb); st->codecpar->block_align = avio_rb32(pb); + + goto got_sound; + break; case 0: if (offset > 0 && st->codecpar->block_align) // COMM && SSND goto got_sound;