From 72b11d5eb036651b6ff68edf3ed270e8fc52960f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 12 Oct 2018 00:46:00 +0100 Subject: Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg to decode images. Hence remove {Image,Graphics}Magick. --- src/lib/wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/wscript') diff --git a/src/lib/wscript b/src/lib/wscript index 768c27f92..75e122e28 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -95,6 +95,7 @@ sources = """ ffmpeg_subtitle_stream.cc film.cc filter.cc + ffmpeg_image_proxy.cc font.cc font_files.cc frame_rate_change.cc @@ -114,7 +115,6 @@ sources = """ json_server.cc log.cc log_entry.cc - magick_image_proxy.cc mid_side_decoder.cc monitor_checker.cc overlaps.cc @@ -177,7 +177,7 @@ def build(bld): obj.uselib = """ AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX - SAMPLERATE POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++ + SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++ CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE """ -- cgit v1.2.3