From patchwork Thu Mar 26 04:05:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18408 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 F1805449F3A for ; Thu, 26 Mar 2020 06:06:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E07E968B120; Thu, 26 Mar 2020 06:06:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B63DC68AE67 for ; Thu, 26 Mar 2020 06:06:08 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id m17so6051557wrw.11 for ; Wed, 25 Mar 2020 21:06:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gM6rF0TNntCe2wT8F1qmwuwyZsQW0tt5Ya0iMtpWdog=; b=pfkKuMJozk176vgi3V/eL3hHhMcJxNCjUE3aopcG8ytFLW2jC6rRFGQmF4gj5XcJH7 ey9PBLj+HL+qdeIRfAGJgqwIXB1FNSnDawaIzGwvAx59VhApohuZdub69FAhl6U2WTeI j5/5P1KD3rvQKCaH6tGsMeDFg/Bo60Zj2hX29sAIxdD6Vv4WODF2/T5bIszp8iKLSm6s uYRIrmgCWaA+gLRuouqD6Fpm9ynAAFNIe/qKb77WdepHGdG6/MwcNPYv2s5i0sDJREge MvfNcHJtZFQGkOEANiKJ0NEoQ7hRPFNWVe+U8GbDozq2tsWBTQrUfM7/ittnOrDn8q1I T3VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gM6rF0TNntCe2wT8F1qmwuwyZsQW0tt5Ya0iMtpWdog=; b=qZiNBQYbeSaQ6odCqLk1LZyLsb6qgBSND2JTy4r/B9oA+NCOKIHqVQr1Ir9bfHqEU0 Y4BMqxSdMqA9nSdGG4CbNo+AFpl8edV7NJhaulez7CIZrmawgFt5BUmIp8YTWOm6UbwK nTFyPJIfDjXnfDIHdJ2EgzTQYIDOqbigna8t6m/NRe5ad9Ys/VqDIokkiHiK4aKlHjCb 2jwwSCz5KnbdjDNnbC/EXUrDYiPG6L203hH0aWj2eAsqVVyZgMzhoIyxwvk1FuXFG6Jo 3ZiGQgBOAbEf2tc3gqa07ulFa33aIhGrYzDidVN58U5Ubw+FynRvfH+75GXu+PJ/2TEd /WSQ== X-Gm-Message-State: ANhLgQ3AOAJL9g+2TOLiCb/Wzr3EZSvF+fNUvGXCH6jrMM8aHflLq5PW KBVJYPY8FWh7q7QEa/3jdu8QNJ9I X-Google-Smtp-Source: ADFU+vsdJx5SAcABdFBkPRxdHYfAJ1cf4zGQtj/Y1AoFMl50UDwUNws3qNEm5Toqh/P+fmTvFdBRWg== X-Received: by 2002:adf:a2dd:: with SMTP id t29mr7042472wra.338.1585195567921; Wed, 25 Mar 2020 21:06:07 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id u13sm1620547wru.88.2020.03.25.21.06.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 21:06:07 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Mar 2020 05:05:39 +0100 Message-Id: <20200326040539.24719-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200326040539.24719-1-andreas.rheinhardt@gmail.com> References: <20200326040539.24719-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/matroskaenc: Update the default version of WavPack 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The Matroska muxer currently assumed WavPack version 4.03 in case it was not explicitly signalled via extradata; but following a recommendation by David Bryant, the WavPack creator, this is changed to 4.10. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f9e69c6c89..725282770e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -612,7 +612,7 @@ static int put_wv_codecpriv(AVIOContext *pb, AVCodecParameters *par) if (par->extradata && par->extradata_size == 2) avio_write(pb, par->extradata, 2); else - avio_wl16(pb, 0x403); // fallback to the version mentioned in matroska specs + avio_wl16(pb, 0x410); // fallback to the most recent version return 0; }