diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-03 10:16:30 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-03 10:16:30 +0300 |
commit | b56858342fdbe48489618107df75e5bd0451eb0b (patch) | |
tree | 5d41ef858502bae99dcbebdd728d42a6040adb03 /etc | |
parent | 8ea7eb77fc7ba8bd0b596ea32ee60909a012828f (diff) | |
parent | bae94777d7ddaa2d4763507fdb93b9520327c9d1 (diff) | |
download | mpv-b56858342fdbe48489618107df75e5bd0451eb0b.tar.bz2 mpv-b56858342fdbe48489618107df75e5bd0451eb0b.tar.xz |
Merge svn changes up to r27514
Diffstat (limited to 'etc')
-rw-r--r-- | etc/codecs.conf | 61 |
1 files changed, 40 insertions, 21 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 14b0f42d68..c8c06023e4 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -642,16 +642,16 @@ videocodec ffdivx status working fourcc MPG3,mpg3 div3 fourcc MP43,mp43 div3 ; MSMPEG-4 v3 (fourcc mapping to div3) - fourcc DIV5,div5 div3 ; DivX 3.20 + fourcc DIV5,div5 div3 ; DivX 3.20 fourcc DIV6,div6 div4 ; -||- fourcc DIV3,div3,DIV4,div4 - fourcc AP41 div3 ; AngelPotion stuff + fourcc AP41 div3 ; AngelPotion stuff fourcc COL1,col1,COL0,col0 ; Cool codec (based on mpg4ds32.ax) - fourcc 3IVD,3ivd ; divxdoctored files (3ivx.com) + fourcc 3IVD,3ivd ; divxdoctored files (3ivx.com) driver ffmpeg dll msmpeg4 out YV12,I420,IYUV - + videocodec ffmp42 info "FFmpeg MSMPEG-4 v2" status working @@ -693,7 +693,7 @@ videocodec ffwmv3 driver ffmpeg dll wmv3 out YV12,I420,IYUV - + videocodec ffvc1 info "FFmpeg WVC1" status buggy @@ -728,7 +728,7 @@ videocodec ffodivx fourcc FMP4,fmp4 fourcc DIVX,divx fourcc DIV1,div1 divx - fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 + fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 fourcc M4S2,m4s2 fourcc xvid,XVID,XviD,XVIX fourcc DX50,dx50,BLZ0 DX50 @@ -736,7 +736,7 @@ videocodec ffodivx format 0x4 fourcc UMP4 fourcc RMP4 - fourcc 3IV2,3iv2 ; 3ivx Delta 4 + fourcc 3IV2,3iv2 ; 3ivx Delta 4 fourcc DXGM fourcc SEDG ; diskless camcorder Samsung Miniket VP-M110 fourcc SMP4,smp4 ; Samsung SMP4 video codec @@ -807,9 +807,9 @@ videocodec divx4vfw comment "sig11 with -framedrop" fourcc DIVX,divx ; opendivx / divx4 fourcc DIV1,div1 divx -; fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 +; fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3 ; for DivX4Linux only! - fourcc AP41 DIV3 ; AngelPotion stuff + fourcc AP41 DIV3 ; AngelPotion stuff format 0x4 driver vfw dll "divx.dll" @@ -827,7 +827,7 @@ videocodec divxds fourcc DIV5,div5 div3 fourcc DIV6,div6 div4 fourcc DIV3,div3,DIV4,div4 - fourcc AP41 div3 ; AngelPotion stuff + fourcc AP41 div3 ; AngelPotion stuff driver dshow dll "divx_c32.ax" guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa @@ -838,15 +838,15 @@ videocodec divx info "DivX ;-) (MSMPEG-4 v3)" status working fourcc MP43,mp43 div3 ; MSMPEG-4 v3 (fourcc mapping to div3) - fourcc DIV5,div5 div3 ; DivX 3.20 + fourcc DIV5,div5 div3 ; DivX 3.20 fourcc DIV6,div6 div4 ; -||- fourcc DIV3,div3,DIV4,div4 - fourcc AP41 div3 ; AngelPotion stuff + fourcc AP41 div3 ; AngelPotion stuff driver vfw dll "divxc32.dll" out YUY2 yuvhack out BGR32,BGR24,BGR15 - + ; hmm. we should check, maybe these are/will be playable with libavcodec: videocodec mpeg4ds @@ -854,7 +854,7 @@ videocodec mpeg4ds status working comment "with postprocessing" fourcc DIV2,div2 mp42 - fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 + fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 fourcc MPG4,mpg4 fourcc MP42,mp42 driver dshow @@ -1106,8 +1106,8 @@ videocodec pegasusm status crashing fourcc MJPG driver vfw -; dll "pvmjpg20.dll" ; v2.0 - dll "pvmjpg21.dll" ; v2.1 +; dll "pvmjpg20.dll" ; v2.0 + dll "pvmjpg21.dll" ; v2.1 out BGR24 flip videocodec pegasusl @@ -1466,7 +1466,7 @@ videocodec ffrv20 driver ffmpeg dll rv20 out YV12,I420,IYUV - + videocodec rv20 info "Linux RealPlayer 8 RV20 decoder" status working @@ -2522,7 +2522,7 @@ videocodec rawy800 info "RAW Y8/Y800" status working driver raw - format 0x0 + format 0x0 format 0x20203859 ; "Y8 " fourcc y800,Y800 out Y800,Y8 @@ -2981,6 +2981,18 @@ audiocodec faad driver faad dll libfaad2 +audiocodec ffaac + info "FFmpeg AAC (MPEG-2/MPEG-4 Audio) decoder" + status working + fourcc mp4a,MP4A + fourcc "VLB " ; Used in NSV, not really working + fourcc "AAC " ; Used in NSV + fourcc "AACP" ; Used in NSV for AACPlus + format 0xff + format 0x706D + driver ffmpeg + dll aac + audiocodec ffflac info "FFmpeg FLAC audio decoder" status working @@ -3197,7 +3209,7 @@ audiocodec imaadpcmacm format 0x11 driver acm dll "imaadp32.acm" - + audiocodec msgsm info "MS GSM" status working @@ -3259,6 +3271,13 @@ audiocodec ffac3 driver ffmpeg dll ac3 +audiocodec ffeac3 + info "FFmpeg E-AC-3" + status working + fourcc EAC3 + driver ffmpeg + dll eac3 + audiocodec dts info "DTS-libdca" status working @@ -3439,8 +3458,8 @@ audiocodec g72x info "G.711/G.721/G.723" status crashing comment "does not work yet - just noise :(" - format 0x111 ; vivo g.723 - format 0x112 ; vivo siren + format 0x111 ; vivo g.723 + format 0x112 ; vivo siren driver g72x dll "g72x.c" |