# HG changeset patch # User diego # Date 1276179258 0 # Node ID 7bd1f0f952926c65daf22b39584e49c63117c780 # Parent 754c22e6d43fefb4e4158bfde51f5a7cec38ad0f Only enable vd_zrmjpeg.c/vf_zrmjpeg.c for MPlayer. Since it is tied to the Zoran video output, it makes no sense for MEncoder. diff -r 754c22e6d43f -r 7bd1f0f95292 Makefile --- a/Makefile Thu Jun 10 11:55:44 2010 +0000 +++ b/Makefile Thu Jun 10 14:14:18 2010 +0000 @@ -326,8 +326,7 @@ 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,7 +660,9 @@ SRCS_MPLAYER-$(XVMC) += libvo/vo_xvmc.c SRCS_MPLAYER-$(XVR100) += libvo/vo_xvr100.c SRCS_MPLAYER-$(YUV4MPEG) += libvo/vo_yuv4mpeg.c -SRCS_MPLAYER-$(ZR) += libvo/jpeg_enc.c libvo/vo_zr.c libvo/vo_zr2.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 = command.c \ m_property.c \