[FFmpeg-cvslog] lavf/mpeg: Identify sub-stream ID 0xa1 as mlp.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Mar  9 14:12:18 2016 +0100| [fb9036b3142e06631a70810c3d779f8e2d9f180c] | committer: Carl Eugen Hoyos

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb9036b3142e06631a70810c3d779f8e2d9f180c
---

 libavformat/mpeg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index a7ceeaf..77d5cd1 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;