diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:44:57 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:44:57 +0200 |
commit | 89c5ed5e9a720b032af9a58263deda158e1cbf4d (patch) | |
tree | 2afd33bf8cd2692201b78a0a2da80824780efc63 /etc | |
parent | 0670a5d0905db1e4bbf376cf005ca836f4d0e04b (diff) | |
parent | cdd0ab0da9818aeb527e35fe73ee57bdf3aa4f70 (diff) | |
download | mpv-89c5ed5e9a720b032af9a58263deda158e1cbf4d.tar.bz2 mpv-89c5ed5e9a720b032af9a58263deda158e1cbf4d.tar.xz |
Merge svn changes up to r30605
Diffstat (limited to 'etc')
-rw-r--r-- | etc/codecs.conf | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 85a212b027..41bc50d559 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3924,6 +3924,13 @@ audiocodec ffape driver ffmpeg dll "ape" +audiocodec ffals + info "FFmpeg ALS" + status working + fourcc "ALS " ; internal MPlayer FourCC + driver ffmpeg + dll "als" + audiocodec ffmlp info "FFmpeg MLP" status working |