diff mbox

[FFmpeg-devel] lavf/matroska: Fix the A_MPEG/L1 codec_id

Message ID 201701030346.06118.cehoyos@ag.or.at
State Accepted
Commit 38e4bcae0944cd58de6bce0f28108bf95a54070a
Headers show

Commit Message

Carl Eugen Hoyos Jan. 3, 2017, 2:46 a.m. UTC
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 <cehoyos@ag.or.at>
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(-)

Comments

Michael Niedermayer Jan. 4, 2017, 5:17 p.m. UTC | #1
On Tue, Jan 03, 2017 at 03:46:06AM +0100, Carl Eugen Hoyos wrote:
> Hi!
> 
> Attached patch fixes MP1 muxing in mkv.
> 
> Please comment, Carl Eugen

>  matroska.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 9ed063b5f9851ad17c82eb4896d9731e59b04d26  0001-lavf-matroska-Fix-the-codec_id-for-mkv-tag-A_MPEG-L1.patch
> From 649977cf7af3734ec81204514874e9d16fcb6b29 Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos <cehoyos@ag.or.at>
> 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(-)

should be ok

thx

PS: please add a fate test

[...]
diff mbox

Patch

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},