diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
| commit | a41db36b22053c2cf103899f3510f68ff5645662 (patch) | |
| tree | e2e3d734a828caf8e1fbf1373d818f06c979e53d /etc/codecs.conf | |
| parent | 267a3f4c9c00848f32c341595d2d831157a79bee (diff) | |
| parent | 84fa3d69f360c87fce4efe6acb128ad78d3647e2 (diff) | |
| download | mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.bz2 mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.xz | |
Merge svn changes up to r26783
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
Diffstat (limited to 'etc/codecs.conf')
| -rw-r--r-- | etc/codecs.conf | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 0d51cdd853..6a4239b1a4 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -9,6 +9,14 @@ release 20070930 ; VIDEO CODECS ;============================================================================= +videocodec ffsiff + info "FFmpeg Beam Software SIFF decoder" + status working + fourcc VBV1 + driver ffmpeg + dll vb + out BGR8 + videocodec ffmimic info "FFmpeg Mimic video" status working @@ -218,6 +226,14 @@ videocodec mpng driver mpng out BGR32,BGR24,BGR8,Y800 +videocodec ffptx + info "FFmpeg V.Flash PTX decoder" + status working + fourcc "ptx " ; internal MPlayer FourCC + driver ffmpeg + dll ptx + out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8 + videocodec fftga info "FFmpeg TGA decoder" status untested @@ -2114,6 +2130,14 @@ videocodec ffbethsoftvid dll bethsoftvid out BGR8 +videocodec ffrl2 + info "FFmpeg RL2 decoder" + status working + fourcc RL2V ; internal MPlayer FourCC + driver ffmpeg + dll rl2 + out BGR8 + videocodec fftxd info "FFmpeg Renderware TeXture Dictionary decoder" status working @@ -3019,6 +3043,7 @@ audiocodec msgsm status working format 0x31 format 0x32 + format 0x204D5347 fourcc agsm driver msgsm |