diff options
| author |  arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-01-23 21:34:28 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-01-23 21:34:28 +0000 |
| commit | 0bd9ce052f695be12d5f329dacdde57c2b59d9ce (patch) | |
| tree | 9852ce9ccbc9890d7409a061f8ed625a3fedd09e | |
| parent | ac311f16f598ba608038cdc7ac59ddf8e31f4ae6 (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
| -rw-r--r-- | libmpdemux/Makefile | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_mkv_old.cpp (renamed from libmpdemux/demux_mkv.cpp) | 0 |
2 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 diff --git a/libmpdemux/demux_mkv.cpp b/libmpdemux/demux_mkv_old.cpp index 47f3b4cbfc..47f3b4cbfc 100644 --- a/libmpdemux/demux_mkv.cpp +++ b/libmpdemux/demux_mkv_old.cpp |