From patchwork Sun Apr 5 20:32:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 18686 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 97EC9448725 for ; Sun, 5 Apr 2020 23:32:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83AC168B170; Sun, 5 Apr 2020 23:32:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.red.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C260E68AF80 for ; Sun, 5 Apr 2020 23:32:51 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail.red.khirnov.net (Postfix) with ESMTP id 28AD028666B for ; Sun, 5 Apr 2020 22:32:50 +0200 (CEST) Received: from mail.red.khirnov.net ([IPv6:::1]) by localhost (mail.red.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id jUQqjq8ntqV5 for ; Sun, 5 Apr 2020 22:32:49 +0200 (CEST) Received: from quelana.khirnov.net (unknown [IPv6:2002:b061:f0a:201:5e:e696:5100:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "quelana.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail.red.khirnov.net (Postfix) with ESMTPS id 9B19C286669 for ; Sun, 5 Apr 2020 22:32:49 +0200 (CEST) Received: from localhost (quelana.khirnov.net [IPv6:::1]) by quelana.khirnov.net (Postfix) with ESMTP id 6E4992175E for ; Sun, 5 Apr 2020 22:32:48 +0200 (CEST) Received: from quelana.khirnov.net ([IPv6:::1]) by localhost (quelana.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id vEcX-PxMEmxL for ; Sun, 5 Apr 2020 22:32:46 +0200 (CEST) Received: from libav.daenerys.khirnov.net (libav.daenerys.khirnov.net [IPv6:2a00:c500:561:201::7]) by quelana.khirnov.net (Postfix) with ESMTP id BB7F7213CC for ; Sun, 5 Apr 2020 22:32:46 +0200 (CEST) Received: by libav.daenerys.khirnov.net (Postfix, from userid 1000) id 0742E20E0087; Sun, 5 Apr 2020 22:32:44 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Apr 2020 22:32:41 +0200 Message-Id: <20200405203241.13033-4-anton@khirnov.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200405203241.13033-1-anton@khirnov.net> References: <20200405203241.13033-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] lavf/wvdec: remove artificial restrictions on stream parameter changes 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" They are not forbidden by the specification. --- libavformat/wvdec.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/libavformat/wvdec.c b/libavformat/wvdec.c index b9fc6a59f9..4159bf1253 100644 --- a/libavformat/wvdec.c +++ b/libavformat/wvdec.c @@ -208,24 +208,6 @@ static int wv_read_block_header(AVFormatContext *ctx, AVIOContext *pb) if (!wc->rate) wc->rate = rate * rate_x; - if (flags && bpp != wc->bpp) { - av_log(ctx, AV_LOG_ERROR, - "Bits per sample differ, this block: %i, header block: %i\n", - bpp, wc->bpp); - return AVERROR_INVALIDDATA; - } - if (flags && !wc->multichannel && chan != wc->chan) { - av_log(ctx, AV_LOG_ERROR, - "Channels differ, this block: %i, header block: %i\n", - chan, wc->chan); - return AVERROR_INVALIDDATA; - } - if (flags && rate != -1 && !(flags & WV_DSD) && rate * rate_x != wc->rate) { - av_log(ctx, AV_LOG_ERROR, - "Sampling rate differ, this block: %i, header block: %i\n", - rate * rate_x, wc->rate); - return AVERROR_INVALIDDATA; - } return 0; }