From d08adcb4f47cd987e93b4bc33f34c6a77f4092d3 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 22 Mar 2002 22:14:01 +0000 Subject: [PATCH] added zlib git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5265 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/Makefile | 2 +- libmpcodecs/vd.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index 1bf686a96d..95d2dd4e1e 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -3,7 +3,7 @@ include ../config.mak LIBNAME = libmpcodecs.a -SRCS=dec_video.c vd.c vd_null.c vd_cinepak.c vd_qtrpza.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_odivx.c vd_divx4.c vd_raw.c vd_xanim.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_nuv.c vd_libmpeg2.c vd_msrle.c vd_huffyuv.c +SRCS=dec_video.c vd.c vd_null.c vd_cinepak.c vd_qtrpza.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_odivx.c vd_divx4.c vd_raw.c vd_xanim.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_nuv.c vd_libmpeg2.c vd_msrle.c vd_huffyuv.c vd_zlib.c ifeq ($(PNG),yes) SRCS += vd_mpng.c diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 1e69d083b3..f9f3e26c9d 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -45,6 +45,7 @@ extern vd_functions_t mpcodecs_vd_mpng; extern vd_functions_t mpcodecs_vd_ijpg; extern vd_functions_t mpcodecs_vd_libmpeg2; extern vd_functions_t mpcodecs_vd_huffyuv; +extern vd_functions_t mpcodecs_vd_zlib; vd_functions_t* mpcodecs_vd_drivers[] = { &mpcodecs_vd_null, @@ -86,6 +87,9 @@ vd_functions_t* mpcodecs_vd_drivers[] = { #endif &mpcodecs_vd_libmpeg2, &mpcodecs_vd_huffyuv, +#ifdef HAVE_ZLIB + &mpcodecs_vd_zlib, +#endif NULL };