fix up Phyllis mistakes for GIF

diff --git a/cinelerra-5.1/cinelerra/file.C b/cinelerra-5.1/cinelerra/file.C
index 0406e174f4f24bb58f81c593b2856e412e22a48d..3202057403e7c2540e8f8db3174963da546283aa 100644 (file)
--- a/cinelerra-5.1/cinelerra/file.C
+++ b/cinelerra-5.1/cinelerra/file.C
@@ -390,7 +390,9 @@ const char *File::default_probes[] = {
 #ifdef HAVE_GIFLIB
        "GIF",
 #endif
+#ifdef HAVE_LIBDPX
        "DPX",
+#endif
 #ifdef HAVE_OPENEXR
        "EXR",
 #endif
@@ -402,7 +404,9 @@ const char *File::default_probes[] = {
        "OGG",
        "Vorbis",
 #endif
+#ifdef HAVE_LIBZMPEG
        "MPEG",
+#endif
        "EDL",
        "FFMPEG_Late",
 }; 

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 10ca2129d42273b3b12c5dddc439cf40ec193460..e83d466603546e1ef77da0920edd392720e8a564 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -70,6 +70,7 @@ CHECK_WITH([vdpau],[video decode+presentation api for unix],[VDPAU],[yes])
 CHECK_WITH([nv],[nvenc/nvdec ffnvcodec api],[NV],[yes])
 CHECK_WITH([cuda],[nv cuda plugins],[CUDA],[auto])
 CHECK_WITH([clang],[use clang instead of gcc/g++],[CLANG],[no])
+CHECK_WITH([filegif],[enable filegif i/o], [GIFLIB],[yes])
 
 if test "x$WANT_LV2" != "xno"; then
   GTK2_LIBS=`pkg-config --libs gtk+-2.0`
@@ -940,7 +941,7 @@ PKG_PROVIDE([esound],[$WANT_ESOUND])
 PKG_PROVIDE([ffmpeg])
 PKG_PROVIDE([fftw])
 PKG_PROVIDE([flac])
-PKG_PROVIDE([giflib])
+PKG_PROVIDE([giflib], [$WANT_GIFLIB])
 PKG_PROVIDE([ilmBase], [$WANT_OPENEXR])
 PKG_PROVIDE([ladspa],[$WANT_LADSPA_BUILD])
 PKG_PROVIDE([lame])
@@ -999,7 +1000,7 @@ if test "x$WANT_CIN_3RDPARTY" != "xno"; then
 fi
 for v in GL XFT XXF86VM OSS ALSA FIREWIRE OGG DV DVB LADSPA \
         VIDEO4LINUX2 ESOUND PULSE PACTL OPENEXR LV2 \
-        COMMERCIAL LIBZMPEG LIBDPX SHUTTLE SHUTTLE_USB XV \
+        COMMERCIAL GIFLIB LIBZMPEG LIBDPX SHUTTLE SHUTTLE_USB XV \
         VAAPI VDPAU CUDA NV WINTV X10TV; do
   eval vv="\$WANT_$v"
   if test "x$vv" != "xno"; then