Mercurial > mplayer.hg

diff etc/codecs.conf @ 34910:3629ef4a19ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support LucasArts SMUSH and VIMA decoding.
author cehoyos
date Fri, 22 Jun 2012 20:02:10 +0000
parents e7bfc26b6e42
children dfce873c5225
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