From 830e0b821dd656c4e60be69e2617b95447d5ae1a Mon Sep 17 00:00:00 2001
From: Kovensky <diogomfranco@gmail.com>
Date: Thu, 8 Oct 2009 14:26:01 -0300
Subject: [PATCH] Revert "Revert "Support PCM in Bluray streams.""

Because recursive reverts are always better.

This reverts commit d6b8bef4056e36e1ffaa2fc07bd8f99f479eeb62.
---
 etc/codecs.conf          | 7 +++++++
 libmpdemux/mp_taglists.c | 1 +
 2 files changed, 8 insertions(+)

diff --git a/etc/codecs.conf b/etc/codecs.conf
index ce6d1db222..9269565ce2 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3852,6 +3852,13 @@ audiocodec dvdpcm
   format 0x10001
   driver dvdpcm
 
+audiocodec lpcm
+  info "Bluray LPCM"
+  status working
+  fourcc BPCM ; internal MPlayer FourCC
+  driver ffmpeg
+  dll pcm_bluray
+
 audiocodec ffac3
   info "FFmpeg AC-3"
   status working
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 92b170d7df..286a755f8b 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -66,6 +66,7 @@ static const struct mp_AVCodecTag mp_codecid_override_tags[] = {
     { CODEC_ID_EAC3,              MKTAG('E', 'A', 'C', '3')},
     { CODEC_ID_H264,              MKTAG('H', '2', '6', '4')},
     { CODEC_ID_MPEG4,             MKTAG('M', 'P', '4', 'V')},
+    { CODEC_ID_PCM_BLURAY,        MKTAG('B', 'P', 'C', 'M')},
     { CODEC_ID_PCM_S8,            MKTAG('t', 'w', 'o', 's')},
     { CODEC_ID_PCM_U8,            1},
     { CODEC_ID_PCM_S16BE,         MKTAG('t', 'w', 'o', 's')},
-- 
2.11.4.GIT