summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-12 22:52:10 +0200
committerwm4 <wm4@nowhere>2013-07-12 23:06:53 +0200
commitcfa571253a6f7ac49736e2d0042c120571ddf2a2 (patch)
tree9cc9b530cd671def03422d212eb95e6649ee30d1 /Makefile
parent6c1e9e4a45d92216a1433ed73ba8f2e09529ca19 (diff)
downloadmpv-cfa571253a6f7ac49736e2d0042c120571ddf2a2.tar.bz2
mpv-cfa571253a6f7ac49736e2d0042c120571ddf2a2.tar.xz
demux_rawvideo/demux_rawaudio: move both demuxers to demux_raw.c
This allows them to share some trivial code. Both demuxers are still separate from user perspective.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a1de600dcc..ad4728270c 100644
--- a/Makefile
+++ b/Makefile
@@ -193,8 +193,7 @@ SOURCES = talloc.c \
demux/demux_mf.c \
demux/demux_mkv.c \
demux/demux_subreader.c \
- demux/demux_rawaudio.c \
- demux/demux_rawvideo.c \
+ demux/demux_raw.c \
demux/ebml.c \
demux/mf.c \
osdep/io.c \