summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2011-03-01 10:53:19 +0000
committerUoti Urpala <uau@mplayer2.org>2011-04-12 19:39:30 +0300
commitfa0d14555dd5ba7c39d97888bcb798a0b3ca47c2 (patch)
tree2c1dbddc7423a1de7c25105a6a6ca995099db503 /libmpdemux
parent85fb21f7a25fdfeaf3e8ae21ab03abe1221a6ca4 (diff)
downloadmpv-fa0d14555dd5ba7c39d97888bcb798a0b3ca47c2.tar.bz2
mpv-fa0d14555dd5ba7c39d97888bcb798a0b3ca47c2.tar.xz
codecs.conf, mp_taglists.c: add LXF PCM and dvvideo
Support audio in Leitch/Harris' VR native stream format (LXF). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32990 b3059339-0415-0410-9bf9-f77b7e298cf2 Support dvvideo in Leitch/Harris' VR native stream format (LXF). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32991 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/mp_taglists.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index e994075d56..146edc42ea 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -46,6 +46,9 @@ static const struct mp_AVCodecTag mp_wav_tags[] = {
{ CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')},
{ CODEC_ID_MUSEPACK8, MKTAG('M', 'P', 'C', '8')},
{ CODEC_ID_NELLYMOSER, MKTAG('N', 'E', 'L', 'L')},
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 92, 0)
+ { CODEC_ID_PCM_LXF, MKTAG('P', 'L', 'X', 'F')},
+#endif
{ CODEC_ID_QCELP, MKTAG('Q', 'c', 'l', 'p')},
{ CODEC_ID_QDM2, MKTAG('Q', 'D', 'M', '2')},
{ CODEC_ID_RA_144, MKTAG('1', '4', '_', '4')},
@@ -71,6 +74,7 @@ static const struct mp_AVCodecTag mp_codecid_override_tags[] = {
{ CODEC_ID_AC3, 0x2000},
{ CODEC_ID_ADPCM_IMA_AMV, MKTAG('A', 'M', 'V', 'A')},
{ CODEC_ID_DTS, 0x2001},
+ { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd')},
{ CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')},
{ CODEC_ID_H264, MKTAG('H', '2', '6', '4')},
{ CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'V')},