diff options
| -rw-r--r-- | etc/codecs.conf | 7 | ||||
| -rw-r--r-- | libmpdemux/mp_taglists.c | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index a31b09d69b..921b34771c 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -4425,6 +4425,13 @@ audiocodec fflpcm driver ffmpeg dll pcm_bluray +audiocodec ffpcmlxf + info "Leitch/Harris PCM" + status working + fourcc PLXF ; internal MPlayer FourCC + driver ffmpeg + dll pcm_lxf + ; add every new fourcc also to allocate_parser() ; in libmpdemux/demuxer.c audiocodec ffac3 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')}, |