From patchwork Fri Oct 16 06:22:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 22995 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 D2CF044898C for ; Fri, 16 Oct 2020 09:22:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B94A668BA3C; Fri, 16 Oct 2020 09:22:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40131.protonmail.ch (mail-40131.protonmail.ch [185.70.40.131]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7336D68BA3C for ; Fri, 16 Oct 2020 09:22:32 +0300 (EEST) Date: Fri, 16 Oct 2020 06:22:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1602829351; bh=lK7TwrWZKdo4misyOae0Ab+a8c2AzRXYlvdOsZAK/i4=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=jE+ohx7zhMbh69dBPvN0UXzwooBPRXWfzf570Ryd/N1+Cb2YHQGGk1LOaLdfhxErW uVLrlJTauWjt15Xxeq4dYysAs39qNeVhOH0ldZ4jMI4ouSmY/P7Cl2K1+PXtaz5mUh WqPOfzkkymWCrk5GkIhKwy/UK4DeV1zK671RZZr7Mg3BqfQcrpl8xMbeX0Kbt7Cb7P Nmj3L5rAFUJYv9qR3/x/2WVzD/A/cckgOtuaLiV45ZW6xItFtypEtvH7v5Q0vJI0o9 jqX7JDUz+6UQ736nLgHcs2qWXIBfS5D8hhsANNH6TJH1ZCHr+WNKFqMAH6a5UNUrh0 T1o7Bo2k66Kxw== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201016062049.2746-2-zane@zanevaniperen.com> In-Reply-To: <20201016062049.2746-1-zane@zanevaniperen.com> References: <20201016062049.2746-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch Subject: [FFmpeg-devel] [PATCH 1/5] avformat/wav: prevent muxing adpcm_swf with a variable block size 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Prefer to error than to create a broken file. Closes ticket #5829. Effectively disables remuxing adpcm_swf from flv -> wav. Signed-off-by: Zane van Iperen --- libavformat/wavenc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c index 1027f107ee..fe7afa03a0 100644 --- a/libavformat/wavenc.c +++ b/libavformat/wavenc.c @@ -303,6 +303,13 @@ static int wav_write_header(AVFormatContext *s) return AVERROR(EINVAL); } + if (s->streams[0]->codecpar->codec_id == AV_CODEC_ID_ADPCM_SWF && + s->streams[0]->codecpar->block_align == 0) { + av_log(s, AV_LOG_ERROR, "%s can only be written to WAVE with a constant frame size\n", + avcodec_get_name(s->streams[0]->codecpar->codec_id)); + return AVERROR(EINVAL); + } + if (wav->rf64 == RF64_ALWAYS) { ffio_wfourcc(pb, "RF64"); avio_wl32(pb, -1); /* RF64 chunk size: use size in ds64 */