From patchwork Tue Jan 3 02:46:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 2028 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp4188109vsb; Mon, 2 Jan 2017 18:46:23 -0800 (PST) X-Received: by 10.28.20.139 with SMTP id 133mr52477396wmu.9.1483411583721; Mon, 02 Jan 2017 18:46:23 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id tz15si75455322wjb.56.2017.01.02.18.46.22; Mon, 02 Jan 2017 18:46:23 -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; 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 D1892689E59; Tue, 3 Jan 2017 04:46:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-2.mx.upcmail.net (vie01a-qmta-pe01-2.mx.upcmail.net [62.179.121.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99BDA689DD8 for ; Tue, 3 Jan 2017 04:46:09 +0200 (EET) Received: from [172.31.218.40] (helo=vie01a-dmta-pe04-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cOF77-0008Jt-Ho for ffmpeg-devel@ffmpeg.org; Tue, 03 Jan 2017 03:46:13 +0100 Received: from [172.31.216.44] (helo=vie01a-pemc-psmtp-pe02) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cOF71-000282-IV for ffmpeg-devel@ffmpeg.org; Tue, 03 Jan 2017 03:46:07 +0100 Received: from [192.168.1.3] ([80.110.104.161]) by vie01a-pemc-psmtp-pe02 with SMTP @ mailcloud.upcmail.net id Tem61u00P3UwvVL01em701; Tue, 03 Jan 2017 03:46:07 +0100 X-SourceIP: 80.110.104.161 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Tue, 3 Jan 2017 03:46:06 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201701030346.06118.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavf/matroska: Fix the A_MPEG/L1 codec_id 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 MP1 muxing in mkv. Please comment, Carl Eugen From 649977cf7af3734ec81204514874e9d16fcb6b29 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 3 Jan 2017 03:43:34 +0100 Subject: [PATCH] lavf/matroska: Fix the codec_id for mkv tag A_MPEG/L1. When the mapping was originally added AV_CODEC_ID_MP1 did not exist. --- libavformat/matroska.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index f3e1be7..c8e5341 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -35,7 +35,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"A_FLAC" , AV_CODEC_ID_FLAC}, {"A_MLP" , AV_CODEC_ID_MLP}, {"A_MPEG/L2" , AV_CODEC_ID_MP2}, - {"A_MPEG/L1" , AV_CODEC_ID_MP2}, + {"A_MPEG/L1" , AV_CODEC_ID_MP1}, {"A_MPEG/L3" , AV_CODEC_ID_MP3}, {"A_OPUS" , AV_CODEC_ID_OPUS}, {"A_OPUS/EXPERIMENTAL",AV_CODEC_ID_OPUS},