From 0bd9ce052f695be12d5f329dacdde57c2b59d9ce Mon Sep 17 00:00:00 2001 From: arpi Date: Fri, 23 Jan 2004 21:34:28 +0000 Subject: [PATCH] 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 --- libmpdemux/Makefile | 2 +- libmpdemux/{demux_mkv.cpp => demux_mkv_old.cpp} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename libmpdemux/{demux_mkv.cpp => demux_mkv_old.cpp} (100%) 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 diff --git a/libmpdemux/demux_mkv.cpp b/libmpdemux/demux_mkv_old.cpp similarity index 100% rename from libmpdemux/demux_mkv.cpp rename to libmpdemux/demux_mkv_old.cpp