summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-24 20:05:28 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-24 20:05:28 +0000
commitb8b5fe55706afa272fde0cea8ab880390700624b (patch)
treeacd941b91f1993fa15b98db7b00d96aaf703bd4d /libmpdemux/demuxer.c
parent61fad6af425c7c40f39f0cc7ed725ffd8dfc058b (diff)
downloadmpv-b8b5fe55706afa272fde0cea8ab880390700624b.tar.bz2
mpv-b8b5fe55706afa272fde0cea8ab880390700624b.tar.xz
Add support for parsing MLP and TrueHD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30427 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 36e94eb747..15960c9ae3 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -458,6 +458,9 @@ static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parse
case 0x86:
codec_id = CODEC_ID_DTS;
break;
+ case MKTAG('M', 'L', 'P', ' '):
+ codec_id = CODEC_ID_MLP;
+ break;
case 0x55:
case 0x5500736d:
case MKTAG('.', 'm', 'p', '3'):
@@ -470,6 +473,9 @@ static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parse
case MKTAG('.', 'm', 'p', '1'):
codec_id = CODEC_ID_MP2;
break;
+ case MKTAG('T', 'R', 'H', 'D'):
+ codec_id = CODEC_ID_TRUEHD;
+ break;
}
if (codec_id != CODEC_ID_NONE) {
*avctx = avcodec_alloc_context();