summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-08-30 21:14:42 +0000
committercehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-08-30 21:14:42 +0000
commit97503eb4ee91d6678c70d85e9b01e07034d26382 (patch)
tree370bd9a3ee18354d0b0e82a6e1fd90067a729ce8
parentc9a80aa6827920008cda3e2995780a97f5a99d77 (diff)
downloadmpv-97503eb4ee91d6678c70d85e9b01e07034d26382.tar.bz2
mpv-97503eb4ee91d6678c70d85e9b01e07034d26382.tar.xz
Support PCM in Bluray streams.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29588 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--etc/codecs.conf7
-rw-r--r--libmpdemux/mp_taglists.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 8143ac2bab..d083d62afc 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3786,6 +3786,13 @@ audiocodec dvdpcm
format 0x10001
driver dvdpcm
+audiocodec lpcm
+ info "Bluray LPCM"
+ status working
+ fourcc BPCM
+ driver ffmpeg
+ dll pcm_bluray
+
audiocodec a52
info "AC3-liba52"
status working
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 3c7be34f25..7aa127b224 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -63,6 +63,7 @@ static const AVCodecTag mp_wav_override_tags[] = {
{ CODEC_ID_PCM_S24LE, 1},
{ CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2')},
{ CODEC_ID_PCM_S32LE, 1},
+ { CODEC_ID_PCM_BLURAY, MKTAG('B', 'P', 'C', 'M')},
{ 0, 0 },
};