Credit Andrew - fix duplicated differing Quantize Buffer declaration when building...

diff --git a/cinelerra-5.1/cinelerra/filegif.C b/cinelerra-5.1/cinelerra/filegif.C
index f7e4564526c2996c08ba8e603d2d1eb6b60c6f27..85a18721c67bb1e023c65cfe98657bac48694f07 100644 (file)
--- a/cinelerra-5.1/cinelerra/filegif.C
+++ b/cinelerra-5.1/cinelerra/filegif.C
@@ -36,11 +36,13 @@
 
 //from "getarg.h"
 extern "C"
+#if !defined HAVE_GIFLIB_QUANTIZE
 int GifQuantizeBuffer(unsigned int Width, unsigned int Height,
                    int *ColorMapSize, GifByteType * RedInput,
                    GifByteType * GreenInput, GifByteType * BlueInput,
                    GifByteType * OutputBuffer,
                    GifColorType * OutputColorMap);
+#endif
 #if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 2 || GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 1 && GIFLIB_RELEASE >= 9
 
 #define ABS(x)    ((x) > 0 ? (x) : (-(x)))
@@ -101,6 +103,7 @@ static int SubdivColorMap(NewColorMapType * NewColorSubdiv,
                           unsigned int ColorMapSize,
                           unsigned int *NewColorMapSize);
 
+#if !defined HAVE_GIFLIB_QUANTIZE
 
 /******************************************************************************
  Quantize high resolution image into lower one. Input image consists of a
@@ -232,6 +235,7 @@ GifQuantizeBuffer(unsigned int Width,
         if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i]))
             MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]);
     }
+#endif
 
 #ifdef DEBUG
     fprintf(stderr,

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index e1f78d24059507af8e54a69fc82043c087aa0f54..582cc7205bfe0e0711ba4b6990a97475a1794603 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -677,6 +677,7 @@ CHECK_LIB([encore], [encore], [encore])
 CHECK_HEADERS([encore], [encore headers], [encore.h])
 CHECK_LIB([giflib], [gif], [DGifOpen])
 CHECK_HEADERS([giflib], [gif lib headers], [gif_lib.h])
+CHECK_LIB([giflib_quantize], [gif], [GifQuantizeBuffer])
 CHECK_LIB([jbig], [jbig], [jbg_dec_init])
 
 CHECK_LIB([VDPAU], [vdpau], [vdp_device_create_x11])
@@ -1078,6 +1079,13 @@ echo ""
 if test "x$WANT_CIN_3RDPARTY" != "xno"; then
   CFG_CFLAGS+=" -DHAVE_CIN_3RDPARTY"
 fi
+
+if test "x$HAVE_GIFLIB_QUANTIZE" = "xyes" -a "x$WANT_CIN_3RDPARTY" = "xno"; then
+  CFG_CFLAGS+=" -DHAVE_GIFLIB_QUANTIZE"
+fi
+
+
+
 for v in GL XFT XXF86VM OSS ALSA FIREWIRE OGG DV DVB LADSPA \
         VIDEO4LINUX2 ESOUND PULSE PACTL OPENEXR LV2 \
         COMMERCIAL GIFLIB LIBZMPEG LIBDPX SHUTTLE SHUTTLE_USB XV \

diff --git a/cinelerra-5.1/ffmpeg/plugin.opts b/cinelerra-5.1/ffmpeg/plugin.opts
index 17851b4922d2b507b985f54ffd12c87e585534d3..d42d27d9d5b1102a8ee9ca7209c2765f36101b07 100644 (file)
--- a/cinelerra-5.1/ffmpeg/plugin.opts
+++ b/cinelerra-5.1/ffmpeg/plugin.opts
@@ -516,3 +516,5 @@ afdelaysrc
 #pad_vaapi ###Operation not permitted
 ; crash in 8.0
 #blackdetect_vulkan
+: do not work in 8.0 (just like the other cuda-s which use nvidia graphics card)
+#scale_cuda ###Operation not implemented when you try to use it