diff options
| author | wm4 <wm4@nowhere> | 2013-11-12 23:42:04 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-12 23:42:04 +0100 |
| commit | e4bbb1d348dafbb32722f413648006a7bd9d0897 (patch) | |
| tree | 7165ed9f86a77b751187600d0a9de8b35416f380 /Makefile | |
| parent | e4f2fcc0ecd31322df65141edf0ddbff9c075f5d (diff) | |
| parent | 22b3f522cacfbdba76d311c86efd6091512eb089 (diff) | |
| download | mpv-e4bbb1d348dafbb32722f413648006a7bd9d0897.tar.bz2 mpv-e4bbb1d348dafbb32722f413648006a7bd9d0897.tar.xz | |
Merge branch 'planar_audio'
Conflicts:
audio/out/ao_lavc.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -139,6 +139,7 @@ endif SOURCES-$(DLOPEN) += video/filter/vf_dlopen.c SOURCES = audio/audio.c \ + audio/audio_buffer.c \ audio/chmap.c \ audio/chmap_sel.c \ audio/fmt-conversion.c \ |