From 012e74d9601ec891bdab4a5fca1837d08e34eaf2 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 24 Jul 2003 19:31:07 +0000 Subject: consistency fixes, bumped version number (and added ffmjpegb) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10467 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 72 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 37 deletions(-) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index f69a91ccd4..9446b1d648 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3,7 +3,7 @@ ; Before editing this file, please read DOCS/tech/codecs.conf.txt ! ;============================================================================= -release 20030119 +release 20030724 ;============================================================================= ; VIDEO CODECS @@ -12,15 +12,6 @@ release 20030119 ; mpeg 1/2 decoding: ; Note: mpegpes is preferred for hw decoders: -videocodec theora - info "Theora (free, reworked VP3)" - status working - fourcc theo,Thra - format 0xFFFC - driver theora - dll libtheora - out YV12 - videocodec mpegpes info "Mpeg PES output (.mpg or Dxr3/DVB card)" comment "for hardware decoding" @@ -40,7 +31,6 @@ videocodec mpeg12 ; dll "libmpeg2" out YV12,I420,IYUV - videocodec ffmpeg12 info "FFmpeg MPEG 1/2" status working @@ -53,7 +43,7 @@ videocodec ffmpeg12 out YV12,I420,IYUV videocodec ffmpeg12mc - info "FFmpeg MPEG 1/2" + info "FFmpeg MPEG 1/2 (XvMC)" status buggy format 0x10000001 ; mpeg 1 format 0x10000002 ; mpeg 2 @@ -69,7 +59,7 @@ videocodec ffmpeg12mc videocodec nuv info "NuppelVideo" status working - fourcc NUV1 + fourcc NUV1 ; NUV1 is an internal MPlayer FOURCC driver nuv out I420,IYUV @@ -93,8 +83,7 @@ videocodec mtga videocodec sgi info "SGI images decoder" status working - comment "SGI1 is an internal MPlayer FOURCC" - fourcc SGI1 + fourcc SGI1 ; SGI1 is an internal MPlayer FOURCC driver sgi out BGR24 @@ -110,8 +99,7 @@ videocodec ffindeo3 videocodec fli info "Autodesk FLI/FLC Animation" status working - comment "FLIC is an internal MPlayer FOURCC" - fourcc FLIC + fourcc FLIC ; FLIC is an internal MPlayer FOURCC driver fli out BGR32,BGR24 @@ -170,6 +158,15 @@ videocodec lzo out YV12,I420 out BGR24 flip +videocodec theora + info "Theora (free, reworked VP3)" + status working + fourcc theo,Thra + format 0xFFFC + driver theora + dll libtheora + out YV12 + ; prefer native codecs over win32? ; the win32 codecs probably are (better) optimized and support direct ; rendering, so this may be not the best idea... @@ -590,6 +587,17 @@ videocodec ffmjpeg out YV12,I420,IYUV out BGR32 ; lossless jpeg +videocodec ffmjpegb + info "FFmpeg MJPEG-B decoder" + status buggy + fourcc mjpb ; Apple MJPEG-B (Quicktime) + driver ffmpeg + dll mjpeg + out 444P + out 422P + out YUY2 ; queryed (conversion from yuv422p) + out YV12,I420,IYUV + ; slow. usable only for standalone jpegs, like -mf, avid or photojpeg: videocodec ijpg info "Independent JPEG Group's codec" @@ -1660,22 +1668,21 @@ audiocodec msadpcm audiocodec dk4adpcm info "Duck DK4 ADPCM (rogue format number)" status working - comment "This format number was used by Duck Corp. but not officially registered with Microsoft" - format 0x61 + format 0x61 ; This format number was used by Duck Corp. but not officially + ; registered with Microsoft driver imaadpcm audiocodec dk3adpcm info "Duck DK3 ADPCM (rogue format number)" status working - comment "This format number was used by Duck Corp. but not officially registered with Microsoft" - format 0x62 + format 0x62 ; This format number was used by Duck Corp. but not officially + ; registered with Microsoft driver dk3adpcm audiocodec roqaudio info "Id RoQ File Audio Decoder" status working - comment "RoQA is an internal MPlayer FOURCC" - fourcc RoQA + fourcc RoQA ; RoQA is an internal MPlayer FOURCC driver roqaudio audiocodec libdv @@ -1693,7 +1700,7 @@ audiocodec ffdv dll "dvaudio" audiocodec faad - info "AAC MPEG2/MPEG4 Audio" + info "FAAD AAC (MPEG2/MPEG4 Audio) decoder" status working fourcc mp4a,MP4A driver faad @@ -1740,7 +1747,6 @@ audiocodec mp3 format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files) format 0x2033504D ; "MP3 " (used in .nsv files) driver mp3lib - flags seekable audiocodec ffwmav1 info "DivX audio v1 (ffmpeg)" @@ -1771,21 +1777,21 @@ audiocodec ffmac6 dll "mace6" audiocodec ffra144 - info "RealAudio 1.0" + info "FFmpeg RealAudio 1.0" status untested format 0x345F3431 ; "14_4" driver ffmpeg dll "real_144" audiocodec ffra288 - info "RealAudio 2.0" + info "FFmpeg RealAudio 2.0" status untested format 0x385F3832 ; "28_8" driver ffmpeg dll "real_288" audiocodec ffmp3 - info "FFmpeg layer-3 audio decoder" + info "FFmpeg MPEG layer-3 audio decoder" comment "integer only" status working format 0x55 @@ -1793,18 +1799,15 @@ audiocodec ffmp3 format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files) driver ffmpeg dll "mp3" - flags seekable audiocodec ffmp2 - info "FFmpeg layer 1,2 audio decoder" + info "FFmpeg MPEG layer-1 and layer-2 audio decoder" comment "integer only" status working format 0x50 driver ffmpeg dll "mp2" - flags seekable -;MAD library audiocodec mad info "libMAD MPEG layer 1-2-3" status working @@ -1814,8 +1817,6 @@ audiocodec mad format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files) driver libmad dll "libmad" - flags seekable - audiocodec mp3acm info "MPEG layer-3" @@ -1824,7 +1825,6 @@ audiocodec mp3acm format 0x55 driver acm dll "l3codeca.acm" - flags seekable audiocodec imaadpcmacm info "IMA ADPCM" @@ -1932,7 +1932,6 @@ audiocodec vorbis format 0xFFFE driver libvorbis dll "libvorbis" - flags seekable ; acm codec doesn't work, haven't tried zorannt dshow codec ; driver acm ; dll "vorbis.acm" @@ -1995,4 +1994,3 @@ audiocodec lhacm format 0x1104 ; SBC driver acm dll "lhacm.acm" - -- cgit v1.2.3