diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:52:17 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:52:17 +0200 |
commit | 5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652 (patch) | |
tree | 705780fb6af4cdc0836a10a409fbd51495ec1142 /etc | |
parent | 5eeba24ab73e4ae64d7212a9ceef3fb8801fe8a8 (diff) | |
parent | 160b880c4fd10cec41ba2c14c846d0a7e7f21048 (diff) | |
download | mpv-5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652.tar.bz2 mpv-5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652.tar.xz |
Merge svn changes up to r30683
Diffstat (limited to 'etc')
-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 3f04ac3c3e..e61d41e440 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -9,6 +9,17 @@ release 20090308 ; VIDEO CODECS ;============================================================================= +videocodec ffbinkvideo + info "FFmpeg Bink Video" + status working + fourcc BIKf ; internal MPlayer FourCC + fourcc BIKg ; internal MPlayer FourCC + fourcc BIKh ; internal MPlayer FourCC + fourcc BIKi ; internal MPlayer FourCC + driver ffmpeg + dll binkvideo + out YV12 + videocodec ffcdgraphics info "FFmpeg CD-Graphics" status working @@ -3755,6 +3766,20 @@ audiocodec ffsmkaud driver ffmpeg dll "smackaud" +audiocodec ffbinkdctaud + info "FFmpeg Bink Audio (DCT)" + status buggy + fourcc BAU1 ; internal MPlayer FourCC + driver ffmpeg + dll "binkaudio_dct" + +audiocodec ffbinkrdftaud + info "FFmpeg Bink Audio (RDFT)" + status working + fourcc BAU2 ; internal MPlayer FourCC + driver ffmpeg + dll "binkaudio_rdft" + audiocodec ffdsicinaudio info "FFmpeg Delphine CIN audio" status working |