summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-08 18:35:32 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-08 18:35:32 +0000
commit7accc822286e4e9e2bac2c66b2e0b46370ec8602 (patch)
tree5636904b0f0506d14194300b0bacd98536028490 /libmpcodecs
parentbf75a7c1c82622463128999c57187928f6219e6b (diff)
downloadmpv-7accc822286e4e9e2bac2c66b2e0b46370ec8602.tar.bz2
mpv-7accc822286e4e9e2bac2c66b2e0b46370ec8602.tar.xz
Separate XviD 3 and XviD 4 tests.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20789 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/Makefile14
1 files changed, 6 insertions, 8 deletions
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 2d71861e82..fd65062240 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -106,10 +106,9 @@ VIDEO_SRCS+=vd_theora.c
endif
ifeq ($(XVID4),yes)
VIDEO_SRCS+=vd_xvid4.c
-else
- ifeq ($(XVID),yes)
- VIDEO_SRCS+=vd_xvid.c
- endif
+endif
+ifeq ($(XVID3),yes)
+VIDEO_SRCS+=vd_xvid.c
endif
ifeq ($(ZORAN),yes)
VIDEO_SRCS+=vd_zrmjpeg.c
@@ -235,10 +234,9 @@ ENCODER_SRCS+=ve_libdv.c
endif
ifeq ($(XVID4),yes)
ENCODER_SRCS+=ve_xvid4.c
-else
- ifeq ($(XVID),yes)
- ENCODER_SRCS+=ve_xvid.c
- endif
+endif
+ifeq ($(XVID3),yes)
+ENCODER_SRCS+=ve_xvid.c
endif
ifeq ($(X264),yes)
ENCODER_SRCS+=ve_x264.c