Mercurial > mplayer.hg

changeset 31334:7ab74cfbcabe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert linking vd_zrmjpeg.c and vf_zrmjpeg.c to MPlayer only. Currently linking decoders or filters to just one program is not possible.
author diego
date Mon, 14 Jun 2010 11:15:21 +0000
parents b11048ce9979
children c9f185fdf201
files Makefile
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Jun 14 11:11:41 2010 +0000
+++ b/Makefile	Mon Jun 14 11:15:21 2010 +0000
@@ -326,7 +326,8 @@
 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-$(ZR)                    += libmpcodecs/vd_zrmjpeg.c \
+                                        libmpcodecs/vf_zrmjpeg.c
 SRCS_COMMON = asxparser.c \
               codec-cfg.c \
               cpudetect.c \
@@ -661,9 +662,7 @@
 SRCS_MPLAYER-$(XVMC)          += libvo/vo_xvmc.c
 SRCS_MPLAYER-$(XVR100)        += libvo/vo_xvr100.c
 SRCS_MPLAYER-$(YUV4MPEG)      += libvo/vo_yuv4mpeg.c
-SRCS_MPLAYER-$(ZR)            += libmpcodecs/vd_zrmjpeg.c \
-                                 libmpcodecs/vf_zrmjpeg.c \
-                                 libvo/jpeg_enc.c libvo/vo_zr.c libvo/vo_zr2.c
+SRCS_MPLAYER-$(ZR)            += libvo/jpeg_enc.c libvo/vo_zr.c libvo/vo_zr2.c
 
 SRCS_MPLAYER = command.c \
                m_property.c \