From 52e97814a18f62e4be7cc5d509ff9025f23ef2be Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Fri, 30 Mar 2018 16:06:55 +0200
Subject: [PATCH] avformat/mpeg: fix PCM-DVD mis-detection as MLP
Fixes #6563.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
libavformat/mpeg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index abdc6a937cb..69d4a9d8ac5 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -568,7 +568,7 @@ redo:
codec_id = AV_CODEC_ID_DTS;
} else if (startcode >= 0xa0 && startcode <= 0xaf) {
type = AVMEDIA_TYPE_AUDIO;
- if (lpcm_header_len == 6 || startcode == 0xa1) {
+ if (lpcm_header_len >= 6 && startcode == 0xa1) {
codec_id = AV_CODEC_ID_MLP;
} else {
codec_id = AV_CODEC_ID_PCM_DVD;
--
GitLab