summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-12-03 12:47:29 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-12-03 12:47:29 +0000
commitc485f7b15c01690908d907c70543180bf1eea5bf (patch)
treee0a30fda287ca7adf505843e0971b7b2a43575e9
parent2b12cb43f1a7da765ca96cb652d118127713153d (diff)
downloadmpv-c485f7b15c01690908d907c70543180bf1eea5bf.tar.bz2
mpv-c485f7b15c01690908d907c70543180bf1eea5bf.tar.xz
cosmetics: Rename ZORAN Makefile variable to ZR for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28077 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile2
-rwxr-xr-xconfigure2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 2c76cfcdec..8d348eace6 100644
--- a/Makefile
+++ b/Makefile
@@ -498,7 +498,7 @@ SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \
SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c
SRCS_COMMON-$(XMMS_PLUGINS) += libmpdemux/demux_xmms.c
SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c
-SRCS_COMMON-$(ZORAN) += libmpcodecs/vd_zrmjpeg.c \
+SRCS_COMMON-$(ZR) += libmpcodecs/vd_zrmjpeg.c \
libmpcodecs/vf_zrmjpeg.c
SRCS_MPLAYER = mplayer.c \
diff --git a/configure b/configure
index 73c64c3ee5..660141724d 100755
--- a/configure
+++ b/configure
@@ -8084,7 +8084,7 @@ X264 = $_x264
XANIM_CODECS = $_xanim
XMMS_PLUGINS = $_xmms
XVID4 = $_xvid
-ZORAN = $_zr
+ZR = $_zr
# FFmpeg
LIBAVUTIL = $_libavutil