From patchwork Mon Sep 12 10:52:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 553 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp1544752vsd; Mon, 12 Sep 2016 03:53:05 -0700 (PDT) X-Received: by 10.194.166.72 with SMTP id ze8mr838302wjb.9.1473677584960; Mon, 12 Sep 2016 03:53:04 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p19si14705862wmb.111.2016.09.12.03.53.00; Mon, 12 Sep 2016 03:53:04 -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; 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 54188689F44; Mon, 12 Sep 2016 13:52:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF12F689CDF for ; Mon, 12 Sep 2016 13:52:40 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1bjOr5-0005GG-7F for ffmpeg-devel@ffmpeg.org; Mon, 12 Sep 2016 12:52:51 +0200 Received: from [192.168.1.3] ([80.110.109.254]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id iasq1t00B5VMxvU01asrEY; Mon, 12 Sep 2016 12:52:51 +0200 X-SourceIP: 80.110.109.254 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Mon, 12 Sep 2016 12:52:49 +0200 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201609121252.50023.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavf/riff: Do not use a rogue twocc for adpcm_swf 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" Hi! Attached patch "fixes" ticket #5829, I am happy if a better solution can be found. Please comment, Carl Eugen From 69d62cac34908fb2a37e37ef1b03b565f2b4ae78 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 12 Sep 2016 12:42:33 +0200 Subject: [PATCH] lavf/riff: Do not use a rogue twocc for adpcm_swf. Fixes ticket #5829. --- libavformat/riff.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/riff.c b/libavformat/riff.c index 72ad5d9..06f2996 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -510,7 +510,6 @@ const AVCodecTag ff_codec_wav_tags[] = { { AV_CODEC_ID_AAC, 0xA106 }, { AV_CODEC_ID_SPEEX, 0xA109 }, { AV_CODEC_ID_FLAC, 0xF1AC }, - { AV_CODEC_ID_ADPCM_SWF, ('S' << 8) + 'F' }, /* HACK/FIXME: Does Vorbis in WAV/AVI have an (in)official ID? */ { AV_CODEC_ID_VORBIS, ('V' << 8) + 'o' }, { AV_CODEC_ID_NONE, 0 },