summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorlumag <lumag@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-04 22:00:25 +0000
committerlumag <lumag@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-04 22:00:25 +0000
commit1e880aa659cc8d82357c175d6142cfd0606eea22 (patch)
treee85a5a66e08f6ad71f8638470e19539c26a6bb54 /etc
parent31235dd9a42beb26105918190af7cffc2f20ff07 (diff)
downloadmpv-1e880aa659cc8d82357c175d6142cfd0606eea22.tar.bz2
mpv-1e880aa659cc8d82357c175d6142cfd0606eea22.tar.xz
FLAC decoding support via imported libmpflac.
TODO: fix FLAC-in-ogg decoding. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11005 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/.libdeps3
-rw-r--r--etc/codecs.conf10
2 files changed, 13 insertions, 0 deletions
diff --git a/etc/.libdeps b/etc/.libdeps
index b3596a3175..9c8ff4afe8 100644
--- a/etc/.libdeps
+++ b/etc/.libdeps
@@ -24,4 +24,7 @@ Gui/libgui.a: $(wildcard Gui/*.[ch])
linux/libosdep.a: $(wildcard linux/*.[ch])
postproc/libpostproc.a: $(wildcard postproc/*.[ch])
input/libinput.a: $(wildcard input/*.[ch])
+ifneq ($(MPFLAC),none)
+libmpflac/libmpflac.a: $(wildcard libmpflac/*.[ch])
+endif
diff --git a/etc/codecs.conf b/etc/codecs.conf
index ac7e6726c9..a7c90e2ca7 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2067,3 +2067,13 @@ 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"
+