summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-07-30 08:36:17 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-07-30 08:36:17 +0000
commitfc5f506c839cb15bd8d7f89e17668852af00283f (patch)
treec9af3b6ae140ebdd98d6e8055f6a6ba63bebe28c
parent45b7b9374bb2a772baa34a52d1abac11c939de15 (diff)
downloadmpv-fc5f506c839cb15bd8d7f89e17668852af00283f.tar.bz2
mpv-fc5f506c839cb15bd8d7f89e17668852af00283f.tar.xz
added inexistant TRHD fourcc to handle TRUEHD streams in forthcoming patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29456 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 103955c322..68bfbf3174 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3548,6 +3548,13 @@ audiocodec ffmlp
driver ffmpeg
dll "mlp"
+audiocodec fftruehd
+ info "FFmpeg TrueHD"
+ status working
+ fourcc TRHD ; internal MPlayer FourCC
+ driver ffmpeg
+ dll "truehd"
+
audiocodec ffnellymoser
info "FFmpeg Nellymoser Audio"
status working
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 6cba293130..3c7be34f25 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -44,6 +44,7 @@ static const AVCodecTag mp_wav_tags[] = {
{ CODEC_ID_ROQ_DPCM, MKTAG('R', 'o', 'Q', 'A')},
{ CODEC_ID_SHORTEN, MKTAG('s', 'h', 'r', 'n')},
{ CODEC_ID_SPEEX, MKTAG('s', 'p', 'x', ' ')},
+ { CODEC_ID_TRUEHD, MKTAG('T', 'R', 'H', 'D')},
{ CODEC_ID_TTA, MKTAG('T', 'T', 'A', '1')},
{ CODEC_ID_WAVPACK, MKTAG('W', 'V', 'P', 'K')},
{ CODEC_ID_WESTWOOD_SND1, MKTAG('S', 'N', 'D', '1')},