prefer ffmpeg over avconv
diff --git a/ChangeLog b/ChangeLog
index c944b5e..529d65e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-10-14 7.0.10-35 <quetzlzacatenango@image...>
+ * Release ImageMagick version 7.0.10-35 GIT revision 17...
+
+2020-10-14 7.0.10-35 <quetzlzacatenango@image...>
+ * prefer ffmpeg over avconv
+
2020-10-07 7.0.10-34 <quetzlzacatenango@image...>
* Release ImageMagick version 7.0.10-34 GIT revision 17695:de3284341:20201008
diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
index 9738a34..9be3eab 100644
--- a/MagickCore/delegate.c
+++ b/MagickCore/delegate.c
@@ -113,7 +113,6 @@
" <delegate decode=\"jpg\" encode=\"lep\" mode=\"encode\" command=\""lepton" "%i" "%o"\"/>"
" <delegate decode=\"jxr\" command=\"mv "%i" "%i.jxr"; "JxrDecApp" -i "%i.jxr" -o "%o.pnm"; mv "%i.jxr" "%i"; mv "%o.pnm" "%o"\"/>"
" <delegate decode=\"lep\" mode=\"decode\" command=\""lepton" "%i" "%o"\"/>"
- " <delegate decode=\"mpeg:decode\" command=\""avconv" -v -1 -i "%i" -vframes %S -vcodec pam -an -f rawvideo -y "%u.pam" 2> "%u"\"/>"
" <delegate decode=\"odt\" command=\""soffice" --convert-to pdf -outdir `dirname "%i"` "%i" 2> "%u"; mv "%i.pdf" "%o"\"/>"
" <delegate decode=\"pcl:cmyk\" stealth=\"True\" command=\""pcl6" -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=pamcmyk32" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s"\"/>"
" <delegate decode=\"pcl:color\" stealth=\"True\" command=\""pcl6" -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=ppmraw" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s"\"/>"
@@ -146,7 +145,8 @@
" <delegate decode=\"xps:cmyk\" stealth=\"True\" command=\""gxps" -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=bmpsep8" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s"\"/>"
" <delegate decode=\"xps:color\" stealth=\"True\" command=\""gxps" -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=ppmraw" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s"\"/>"
" <delegate decode=\"xps:mono\" stealth=\"True\" command=\""gxps" -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=pbmraw" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s"\"/>"
- " <delegate encode=\"mpeg:encode\" stealth=\"True\" command=\""avconv" -v -1 -i "%M%%d.jpg" "%u.%m" 2> "%u"\"/>"
+ " <delegate decode=\"mpeg:decode\" command=\""ffmpeg" -v -1 -i "%i" -vframes %S -vcodec pam -an -f rawvideo -y "%u.pam" 2> "%u"\"/>"
+ " <delegate encode=\"mpeg:encode\" stealth=\"True\" command=\""ffmpeg" -v -1 -i "%M%%d.jpg" -plays %I "%u.%m" 2> "%u"\"/>"
"</delegatemap>";
/*
diff --git a/Makefile.in b/Makefile.in
index 76a50c2..3334d48 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3252,8 +3252,8 @@
MODULES_PATH = @MODULES_PATH@
MODULES_RELATIVE_PATH = @MODULES_RELATIVE_PATH@
MODULE_EXTRA_CPPFLAGS = @MODULE_EXTRA_CPPFLAGS@
-MPEGDecodeDelegate = @MPEGDecodeDelegate@
-MPEGEncodeDelegate = @MPEGEncodeDelegate@
+VIDEODecodeDelegate = @VIDEODecodeDelegate@
+VIDEOEncodeDelegate = @VIDEOEncodeDelegate@
MVDelegate = @MVDelegate@
MogrifyDelegate = @MogrifyDelegate@
MrSIDDecodeDelegate = @MrSIDDecodeDelegate@
diff --git a/configure b/configure
index c08e7f7..91b4ba6 100755
--- a/configure
+++ b/configure
@@ -704,8 +704,8 @@
PCLDelegate
MVDelegate
MrSIDDecodeDelegate
-MPEGEncodeDelegate
-MPEGDecodeDelegate
+VIDEOEncodeDelegate
+VIDEODecodeDelegate
MogrifyDelegate
LaunchDelegate
LPRDelegate
@@ -4575,7 +4575,7 @@
MAGICK_VERSION=7.0.10-35
-MAGICK_GIT_REVISION=17698:3b12a5757:20201009
+MAGICK_GIT_REVISION=17712:2b4b9a757:20201014
# Substitute library versioning
@@ -32994,8 +32994,6 @@
LPDelegateDefault='lp'
LPRDelegateDefault='lpr'
LaunchDelegateDefault='gimp'
-MPEGDecodeDelegateDefault='avconv'
-MPEGEncodeDelegateDefault='avconv'
MrSIDDecodeDelegateDefault='mrsidgeodecode'
MVDelegateDefault='mv'
PCLDelegateDefault='pcl6'
@@ -33010,6 +33008,8 @@
RSVGDecodeDelegateDefault='rsvg-convert'
SVGDecodeDelegateDefault='inkscape'
TraceEncodeDelegateDefault='potrace'
+VIDEODecodeDelegateDefault='ffmpeg'
+VIDEOEncodeDelegateDefault='ffmpeg'
WebPDecodeDelegateDefault='dwebp'
WebPEncodeDelegateDefault='cwebp'
WWWDecodeDelegateDefault='curl'
@@ -33923,16 +33923,16 @@
fi
-# Extract the first word of " "$MPEGDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$MPEGDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$VIDEODecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$VIDEODecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MPEGDecodeDelegate+:} false; then :
+if ${ac_cv_path_VIDEODecodeDelegate+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $MPEGDecodeDelegate in
+ case $VIDEODecodeDelegate in
[\\/]* | ?:[\\/]*)
- ac_cv_path_MPEGDecodeDelegate="$MPEGDecodeDelegate" # Let the user override the test with a path.
+ ac_cv_path_VIDEODecodeDelegate="$VIDEODecodeDelegate" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -33942,7 +33942,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_MPEGDecodeDelegate="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_VIDEODecodeDelegate="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -33950,32 +33950,30 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_MPEGDecodeDelegate" && ac_cv_path_MPEGDecodeDelegate=" "$MPEGDecodeDelegateDefault""
+ test -z "$ac_cv_path_VIDEODecodeDelegate" && ac_cv_path_VIDEODecodeDelegate=" "$VIDEODecodeDelegateDefault""
;;
esac
fi
-MPEGDecodeDelegate=$ac_cv_path_MPEGDecodeDelegate
-if test -n "$MPEGDecodeDelegate"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPEGDecodeDelegate" >&5
-$as_echo "$MPEGDecodeDelegate" >&6; }
+VIDEODecodeDelegate=$ac_cv_path_VIDEODecodeDelegate
+if test -n "$VIDEODecodeDelegate"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VIDEODecodeDelegate" >&5
+$as_echo "$VIDEODecodeDelegate" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-if test "$MPEGDecodeDelegate" = "$MPEGDecodeDelegateDefault" ; then
- MPEGDecodeDelegateDefault='ffmpeg'
- # Extract the first word of " "$MPEGDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$MPEGDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$VIDEOEncodeDelegateDefault"", so it can be a program name with args.
+set dummy "$VIDEOEncodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MPEGDecodeDelegate+:} false; then :
+if ${ac_cv_path_VIDEOEncodeDelegate+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $MPEGDecodeDelegate in
+ case $VIDEOEncodeDelegate in
[\\/]* | ?:[\\/]*)
- ac_cv_path_MPEGDecodeDelegate="$MPEGDecodeDelegate" # Let the user override the test with a path.
+ ac_cv_path_VIDEOEncodeDelegate="$VIDEOEncodeDelegate" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -33985,7 +33983,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_MPEGDecodeDelegate="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_VIDEOEncodeDelegate="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -33993,106 +33991,20 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_MPEGDecodeDelegate" && ac_cv_path_MPEGDecodeDelegate=" "$MPEGDecodeDelegateDefault""
+ test -z "$ac_cv_path_VIDEOEncodeDelegate" && ac_cv_path_VIDEOEncodeDelegate=" "$VIDEOEncodeDelegateDefault""
;;
esac
fi
-MPEGDecodeDelegate=$ac_cv_path_MPEGDecodeDelegate
-if test -n "$MPEGDecodeDelegate"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPEGDecodeDelegate" >&5
-$as_echo "$MPEGDecodeDelegate" >&6; }
+VIDEOEncodeDelegate=$ac_cv_path_VIDEOEncodeDelegate
+if test -n "$VIDEOEncodeDelegate"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VIDEOEncodeDelegate" >&5
+$as_echo "$VIDEOEncodeDelegate" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-fi;
-# Extract the first word of " "$MPEGEncodeDelegateDefault"", so it can be a program name with args.
-set dummy "$MPEGEncodeDelegateDefault"; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MPEGEncodeDelegate+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $MPEGEncodeDelegate in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MPEGEncodeDelegate="$MPEGEncodeDelegate" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_MPEGEncodeDelegate="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_MPEGEncodeDelegate" && ac_cv_path_MPEGEncodeDelegate=" "$MPEGEncodeDelegateDefault""
- ;;
-esac
-fi
-MPEGEncodeDelegate=$ac_cv_path_MPEGEncodeDelegate
-if test -n "$MPEGEncodeDelegate"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPEGEncodeDelegate" >&5
-$as_echo "$MPEGEncodeDelegate" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$MPEGEncodeDelegate" = "$MPEGEncodeDelegateDefault" ; then
- MPEGEncodeDelegateDefault='ffmpeg'
- # Extract the first word of " "$MPEGEncodeDelegateDefault"", so it can be a program name with args.
-set dummy "$MPEGEncodeDelegateDefault"; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MPEGEncodeDelegate+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $MPEGEncodeDelegate in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MPEGEncodeDelegate="$MPEGEncodeDelegate" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_MPEGEncodeDelegate="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_MPEGEncodeDelegate" && ac_cv_path_MPEGEncodeDelegate=" "$MPEGEncodeDelegateDefault""
- ;;
-esac
-fi
-MPEGEncodeDelegate=$ac_cv_path_MPEGEncodeDelegate
-if test -n "$MPEGEncodeDelegate"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPEGEncodeDelegate" >&5
-$as_echo "$MPEGEncodeDelegate" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi;
# Extract the first word of " "$MrSIDDecodeDelegateDefault"", so it can be a program name with args.
set dummy "$MrSIDDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -34646,13 +34558,13 @@
MogrifyDelegate="${BIN_DIR}/${MogrifyDelegateDefault}"
# Set delegate booleans
-have_avconv='no'; if test "$MPEGDecodeDelegate" != "$MPEGDecodeDelegateDefault" ; then have_avconv='yes'; fi
have_gs='no' ; if test "$PSDelegate" != "$PSDelegateDefault"; then have_gs='yes'; fi
have_hp2xx='no' ; if test "$HPGLDecodeDelegate" != "$HPGLDecodeDelegateDefault" ; then have_hp2xx='yes'; fi
have_ilbmtoppm='no' ; if test "$ILBMDecodeDelegate" != "$ILBMDecodeDelegateDefault" ; then have_ilbmtoppm='yes'; fi
have_mrsid='no'; if test "$MrSIDDecodeDelegate" != "$MrSIDDecodeDelegateDefault" ; then have_mrsid='yes'; fi
have_pcl='no' ; if test "$PCLDelegate" != "$PCLDelegateDefault"; then have_pcl='yes'; fi
have_ppmtoilbm='no' ; if test "$ILBMEncodeDelegate" != "$ILBMEncodeDelegateDefault" ; then have_ppmtoilbm='yes'; fi
+have_video='no'; if test "$VIDEODecodeDelegate" != "$VIDEODecodeDelegateDefault" ; then have_video='yes'; fi
have_xps='no' ; if test "$XPSDelegate" != "$XPSDelegateDefault"; then have_xps='yes'; fi
#
@@ -34831,8 +34743,6 @@
LEPDelegate="$LEPDelegateDefault"
LPDelegate="$LPDelegateDefault"
LaunchDelegate="$LaunchDelegateDefault"
- MPEGDecodeDelegate="$MPEGDecodeDelegateDefault"
- MPEGEncodeDelegate="$MPEGEncodeDelegateDefault"
MogrifyDelegate="$MogrifyDelegateDefault"
MrSIDDecodeDelegate="$MrSIDDecodeDelegateDefault"
PCLDelegate="$PCLDelegateDefault"
@@ -34842,6 +34752,8 @@
ShowImageDelegate="$ShowImageDelegateDefault"
TraceEncodeDelegate="$TraceEncodeDelegateDefault"
Fig2devDelegate="$Fig2devDelegateDefault"
+ VIDEODecodeDelegate="$VIDEODecodeDelegateDefault"
+ VIDEOEncodeDelegate="$VIDEOEncodeDelegateDefault"
WebPDecodeDelegate="$WebPDecodeDelegateDefault"
WebPEncodeDelegate="$WebPEncodeDelegateDefault"
WWWDecodeDelegate="$WWWDecodeDelegateDefault"
@@ -35588,9 +35500,6 @@
if test "$have_djvu" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES djvu"
fi
-if test "$have_avconv" = 'yes' ; then
- MAGICK_DELEGATES="$MAGICK_DELEGATES mpeg"
-fi
if test "$have_fftw" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES fftw"
fi
@@ -35672,6 +35581,9 @@
if test "$have_ttf" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES ttf"
fi
+if test "$have_video" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES video"
+fi
if test "$have_webp" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES webp"
fi
diff --git a/configure.ac b/configure.ac
index d3f5fd3..5662100 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3173,8 +3173,6 @@
LPDelegateDefault='lp'
LPRDelegateDefault='lpr'
LaunchDelegateDefault='gimp'
-MPEGDecodeDelegateDefault='avconv'
-MPEGEncodeDelegateDefault='avconv'
MrSIDDecodeDelegateDefault='mrsidgeodecode'
MVDelegateDefault='mv'
PCLDelegateDefault='pcl6'
@@ -3189,6 +3187,8 @@
RSVGDecodeDelegateDefault='rsvg-convert'
SVGDecodeDelegateDefault='inkscape'
TraceEncodeDelegateDefault='potrace'
+VIDEODecodeDelegateDefault='ffmpeg'
+VIDEOEncodeDelegateDefault='ffmpeg'
WebPDecodeDelegateDefault='dwebp'
WebPEncodeDelegateDefault='cwebp'
WWWDecodeDelegateDefault='curl'
@@ -3217,16 +3217,8 @@
AC_PATH_PROG([LPRDelegate],[ "$LPRDelegateDefault"],[ "$LPRDelegateDefault"])
AC_PATH_PROG([LaunchDelegate],[ "$LaunchDelegateDefault"],[ "$LaunchDelegateDefault"])
AC_PATH_PROG([MogrifyDelegate],[ "$MogrifyDelegateDefault"],[ "$MogrifyDelegateDefault"])
-AC_PATH_PROG([MPEGDecodeDelegate],[ "$MPEGDecodeDelegateDefault"],[ "$MPEGDecodeDelegateDefault"])
-if test "$MPEGDecodeDelegate" = "$MPEGDecodeDelegateDefault" ; then
- MPEGDecodeDelegateDefault='ffmpeg'
- AC_PATH_PROG([MPEGDecodeDelegate],[ "$MPEGDecodeDelegateDefault"],[ "$MPEGDecodeDelegateDefault"])
-fi;
-AC_PATH_PROG([MPEGEncodeDelegate],[ "$MPEGEncodeDelegateDefault"],[ "$MPEGEncodeDelegateDefault"])
-if test "$MPEGEncodeDelegate" = "$MPEGEncodeDelegateDefault" ; then
- MPEGEncodeDelegateDefault='ffmpeg'
- AC_PATH_PROG([MPEGEncodeDelegate],[ "$MPEGEncodeDelegateDefault"],[ "$MPEGEncodeDelegateDefault"])
-fi;
+AC_PATH_PROG([VIDEODecodeDelegate],[ "$VIDEODecodeDelegateDefault"],[ "$VIDEODecodeDelegateDefault"])
+AC_PATH_PROG([VIDEOEncodeDelegate],[ "$VIDEOEncodeDelegateDefault"],[ "$VIDEOEncodeDelegateDefault"])
AC_PATH_PROG([MrSIDDecodeDelegate],[ "$MrSIDDecodeDelegateDefault"],[ "$MrSIDDecodeDelegateDefault"])
AC_PATH_PROG([MVDelegate],[ "$MVDelegateDefault"],[ "$MVDelegateDefault"])
AC_PATH_PROG([PCLDelegate],[ "$PCLDelegateDefault"],[ "$PCLDelegateDefault"])
@@ -3255,13 +3247,13 @@
MogrifyDelegate="${BIN_DIR}/${MogrifyDelegateDefault}"
# Set delegate booleans
-have_avconv='no'; if test "$MPEGDecodeDelegate" != "$MPEGDecodeDelegateDefault" ; then have_avconv='yes'; fi
have_gs='no' ; if test "$PSDelegate" != "$PSDelegateDefault"; then have_gs='yes'; fi
have_hp2xx='no' ; if test "$HPGLDecodeDelegate" != "$HPGLDecodeDelegateDefault" ; then have_hp2xx='yes'; fi
have_ilbmtoppm='no' ; if test "$ILBMDecodeDelegate" != "$ILBMDecodeDelegateDefault" ; then have_ilbmtoppm='yes'; fi
have_mrsid='no'; if test "$MrSIDDecodeDelegate" != "$MrSIDDecodeDelegateDefault" ; then have_mrsid='yes'; fi
have_pcl='no' ; if test "$PCLDelegate" != "$PCLDelegateDefault"; then have_pcl='yes'; fi
have_ppmtoilbm='no' ; if test "$ILBMEncodeDelegate" != "$ILBMEncodeDelegateDefault" ; then have_ppmtoilbm='yes'; fi
+have_video='no'; if test "$VIDEODecodeDelegate" != "$VIDEODecodeDelegateDefault" ; then have_video='yes'; fi
have_xps='no' ; if test "$XPSDelegate" != "$XPSDelegateDefault"; then have_xps='yes'; fi
#
@@ -3425,8 +3417,6 @@
LEPDelegate="$LEPDelegateDefault"
LPDelegate="$LPDelegateDefault"
LaunchDelegate="$LaunchDelegateDefault"
- MPEGDecodeDelegate="$MPEGDecodeDelegateDefault"
- MPEGEncodeDelegate="$MPEGEncodeDelegateDefault"
MogrifyDelegate="$MogrifyDelegateDefault"
MrSIDDecodeDelegate="$MrSIDDecodeDelegateDefault"
PCLDelegate="$PCLDelegateDefault"
@@ -3436,6 +3426,8 @@
ShowImageDelegate="$ShowImageDelegateDefault"
TraceEncodeDelegate="$TraceEncodeDelegateDefault"
Fig2devDelegate="$Fig2devDelegateDefault"
+ VIDEODecodeDelegate="$VIDEODecodeDelegateDefault"
+ VIDEOEncodeDelegate="$VIDEOEncodeDelegateDefault"
WebPDecodeDelegate="$WebPDecodeDelegateDefault"
WebPEncodeDelegate="$WebPEncodeDelegateDefault"
WWWDecodeDelegate="$WWWDecodeDelegateDefault"
@@ -3461,8 +3453,8 @@
AC_SUBST([LaunchDelegate])
AC_SUBST([LEPDelegate])
AC_SUBST([LPDelegate])
-AC_SUBST([MPEGDecodeDelegate])
-AC_SUBST([MPEGEncodeDelegate])
+AC_SUBST([VIDEODecodeDelegate])
+AC_SUBST([VIDEOEncodeDelegate])
AC_SUBST([MogrifyDelegate])
AC_SUBST([MrSIDDecodeDelegate])
AC_SUBST([PCLDelegate])
@@ -3764,9 +3756,6 @@
if test "$have_djvu" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES djvu"
fi
-if test "$have_avconv" = 'yes' ; then
- MAGICK_DELEGATES="$MAGICK_DELEGATES mpeg"
-fi
if test "$have_fftw" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES fftw"
fi
@@ -3848,6 +3837,9 @@
if test "$have_ttf" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES ttf"
fi
+if test "$have_video" = 'yes' ; then
+ MAGICK_DELEGATES="$MAGICK_DELEGATES video"
+fi
if test "$have_webp" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES webp"
fi