summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-02-18 12:34:32 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-02-18 12:34:32 +0000
commit171c2ae2f4a7903708ca4159418dae162522df74 (patch)
tree744224ff67be6d42f106b2cea380240c6bd4266f /etc
parent1cbd9c581e08f28b009ba1e599197f59e9b2d376 (diff)
downloadmpv-171c2ae2f4a7903708ca4159418dae162522df74.tar.bz2
mpv-171c2ae2f4a7903708ca4159418dae162522df74.tar.xz
ffmpeg flac decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11974 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf25
1 files changed, 15 insertions, 10 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index a83fc6f521..d94c88b2ca 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1884,6 +1884,21 @@ audiocodec faad
driver faad
dll libfaad2
+audiocodec flac
+ info "Free Lossless Audio Codec"
+ status untested
+ comment "using libmpflac or libflac"
+ format 0x43614C66
+ driver flac
+ dll "libmpflac"
+
+audiocodec ffflac
+ info "FFmpeg FLAC audio decoder"
+ status working
+ format 0x43614C66
+ driver ffmpeg
+ dll "flac"
+
audiocodec pcm
info "Uncompressed PCM"
status working
@@ -2186,13 +2201,3 @@ audiocodec lhacm
format 0x1104 ; SBC
driver acm
dll "lhacm.acm"
-
-audiocodec flac
- info "Free Lossless Audio Codec"
- status untested
- flags seekable
- comment "using libmpflac or libFLAC. Internal format No"
- format 0x43614C66 ; fLaC with mmioFOURCC
- driver flac
- dll "libmpflac"
-