Mercurial > mplayer.hg
changeset 34910:3629ef4a19ce
Support LucasArts SMUSH and VIMA decoding.
| author | cehoyos |
|---|---|
| date | Fri, 22 Jun 2012 20:02:10 +0000 |
| parents | 40a9417d9ee8 |
| children | dfce873c5225 |
| files | etc/codecs.conf libmpdemux/mp_taglists.c |
| diffstat | 2 files changed, 21 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/codecs.conf Tue Jun 12 17:55:52 2012 +0000 +++ b/etc/codecs.conf Fri Jun 22 20:02:10 2012 +0000 @@ -85,6 +85,14 @@ dll mmvideo out BGR8 +videocodec ffsanm + info "FFmpeg LucasArts SMUSH video" + status working + fourcc SANM ; internal MPlayer FourCC + driver ffmpeg + dll sanm + out BGR16,BGR8 + videocodec ffsiff info "FFmpeg Beam Software SIFF" status working @@ -4551,6 +4559,13 @@ driver ffmpeg dll adpcm_ima_ws +audiocodec ffvima + info "FFmpeg LucasArts VIMA audio" + status working + fourcc VIMA ; internal MPlayer FourCC + driver ffmpeg + dll vima + audiocodec ffwssnd1 info "FFmpeg Westwood SND1" status working
--- a/libmpdemux/mp_taglists.c Tue Jun 12 17:55:52 2012 +0000 +++ b/libmpdemux/mp_taglists.c Fri Jun 22 20:02:10 2012 +0000 @@ -69,6 +69,9 @@ { CODEC_ID_SPEEX, MKTAG('s', 'p', 'x', ' ')}, { CODEC_ID_TTA, MKTAG('T', 'T', 'A', '1')}, { CODEC_ID_TWINVQ, MKTAG('T', 'W', 'I', '2')}, +#if LIBAVUTIL_VERSION_MICRO >= 100 + { CODEC_ID_VIMA, MKTAG('V', 'I', 'M', 'A')}, +#endif { CODEC_ID_VMDAUDIO, MKTAG('V', 'M', 'D', 'A')}, { CODEC_ID_WAVPACK, MKTAG('W', 'V', 'P', 'K')}, { CODEC_ID_WESTWOOD_SND1, MKTAG('S', 'N', 'D', '1')}, @@ -147,6 +150,9 @@ { CODEC_ID_RV20, MKTAG('R', 'V', '2', '0')}, { CODEC_ID_RV30, MKTAG('R', 'V', '3', '0')}, { CODEC_ID_RV40, MKTAG('R', 'V', '4', '0')}, +#if LIBAVUTIL_VERSION_MICRO >= 100 + { CODEC_ID_SANM, MKTAG('S', 'A', 'N', 'M')}, +#endif { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3')}, { CODEC_ID_TMV, MKTAG('t', 'm', 'v', '8')}, { CODEC_ID_TGV, MKTAG('f', 'V', 'G', 'T')},