aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpdemux/Makefile
diff options
context:
space:
mode:
authorGravatar arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-23 21:34:28 +0000
committerGravatar arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-23 21:34:28 +0000
commit0bd9ce052f695be12d5f329dacdde57c2b59d9ce (patch)
tree9852ce9ccbc9890d7409a061f8ed625a3fedd09e /libmpdemux/Makefile
parentac311f16f598ba608038cdc7ac59ddf8e31f4ae6 (diff)
mkv.cpp -> mkv_old.cpp, to avoid dependency name collision with mkv.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11837 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/Makefile')
-rw-r--r--libmpdemux/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index ff6b288380..ab6191554f 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -30,7 +30,7 @@ ifeq ($(MATROSKA_INTERNAL),yes)
SRCS += demux_mkv.c ebml.c
endif
ifeq ($(MATROSKA_EXTERNAL),yes)
-CPLUSPLUSSRCS += demux_mkv.cpp
+CPLUSPLUSSRCS += demux_mkv_old.cpp
endif