summaryrefslogtreecommitdiff
path: root/libavformat/mpeg.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2016-03-09 14:12:18 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2016-03-09 14:12:18 +0100
commitfb9036b3142e06631a70810c3d779f8e2d9f180c (patch)
treec3ab853e41209d375128c63790e87ba19940021b /libavformat/mpeg.c
parent260c12cdd1df1379089b0256451670945e27121c (diff)
downloadffmpeg-fb9036b3142e06631a70810c3d779f8e2d9f180c.tar.gz
lavf/mpeg: Identify sub-stream ID 0xa1 as mlp.
Fixes ticket #4786. Auto-detection seems difficult, patch mostly confirmed by http://dvd-audio.sourceforge.net/spec/aob.shtml
Diffstat (limited to 'libavformat/mpeg.c')
-rw-r--r--libavformat/mpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index a7ceeaf01d..77d5cd10ab 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) {
+ if (lpcm_header_len == 6 || startcode == 0xa1) {
codec_id = AV_CODEC_ID_MLP;
} else {
codec_id = AV_CODEC_ID_PCM_DVD;