diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
commit | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch) | |
tree | 2ead158ae6e6abfffcccf1609aa5492f9402e24f /etc/codecs.conf | |
parent | d5c868325cefcd5fad53361d1dfdc9757674eb70 (diff) | |
parent | 4653f5ed7575d6070b54a88b4deb449f838825b3 (diff) | |
download | mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.bz2 mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.xz |
Merge svn changes up to r27025
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
Diffstat (limited to 'etc/codecs.conf')
-rw-r--r-- | etc/codecs.conf | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index fe41f3353c..2d149fa2ea 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -686,6 +686,7 @@ videocodec ffodivx fourcc DXGM fourcc SEDG ; diskless camcorder Samsung Miniket VP-M110 fourcc SMP4,smp4 ; Samsung SMP4 video codec + fourcc VIDM ; vidm 4.01 codec format 0x10000004 ; mpeg 4 es driver ffmpeg dll mpeg4 ;opendivx @@ -717,6 +718,7 @@ videocodec xvid fourcc DXGM fourcc SEDG ; diskless camcorder Samsung Miniket VP-M110 fourcc SMP4,smp4 ; Samsung SMP4 video codec + fourcc VIDM ; vidm 4.01 codec format 0x10000004 ; mpeg 4 es driver xvid out YV12 @@ -1470,6 +1472,14 @@ videocodec lagarith dll "lagarith.dll" out BGR32,BGR24 flip +videocodec psiv + info "Infinite Video PSI_V" + status working + fourcc PSIV + driver vfw + dll "psiv.dll" + out BGR32,BGR24 query,flip + videocodec canopushq status working info "Canopus HQ Codec" @@ -1815,6 +1825,14 @@ videocodec qt3ivx dll "3ivx Delta 3.5.qtx" out YUY2 +videocodec qtactl + info "Win32/QuickTime Streambox ACT-L2" + status working + fourcc ACTL + driver qtvideo + dll ACTLComponent.qtx + out YUY2 + videocodec qtavui info "Win32/QuickTime Avid Meridien Uncompressed" status working |