diff options
author | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
commit | e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2 (patch) | |
tree | 08b54ef9bb771434fc7fbe9185793503d3ba314c /Makefile | |
parent | 6a83ef1552de4a1a71da49e45647ce1a4ce64e53 (diff) | |
parent | 48f94311516dc1426644b3e68b2a48c22727e1e7 (diff) | |
download | mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.bz2 mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.xz |
Merge branch 'audio_changes'
Conflicts:
audio/out/ao_lavc.c
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -124,6 +124,10 @@ ifeq ($(HAVE_AVUTIL_REFCOUNTING),no) endif SOURCES = talloc.c \ + audio/audio.c \ + audio/chmap.c \ + audio/chmap_sel.c \ + audio/fmt-conversion.c \ audio/format.c \ audio/mixer.c \ audio/reorder_ch.c \ @@ -138,6 +142,7 @@ SOURCES = talloc.c \ audio/filter/af_dummy.c \ audio/filter/af_equalizer.c \ audio/filter/af_extrastereo.c \ + audio/filter/af_force.c \ audio/filter/af_format.c \ audio/filter/af_hrtf.c \ audio/filter/af_karaoke.c \ |