Commit 8beb4178 authored by Stefano Sabatini's avatar Stefano Sabatini

Replace two occurrences of 'vfwcap_demuxer' with 'vfwcap_indev', I

missed them in r19293. Re-enable version check on w32api.h if the
vfwcap input device has been selected.

Originally committed as revision 19461 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 0e57fe17
...@@ -1803,9 +1803,9 @@ case $target_os in ...@@ -1803,9 +1803,9 @@ case $target_os in
if ! enabled x86_64; then if ! enabled x86_64; then
check_cpp_condition _mingw.h "(__MINGW32_MAJOR_VERSION > 3) || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" || check_cpp_condition _mingw.h "(__MINGW32_MAJOR_VERSION > 3) || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
die "ERROR: MinGW runtime version must be >= 3.15." die "ERROR: MinGW runtime version must be >= 3.15."
enabled_any avisynth vfwcap_demuxer && enabled_any avisynth vfwcap_indev &&
{ check_cpp_condition w32api.h "(__W32API_MAJOR_VERSION > 3) || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION >= 13)" || { check_cpp_condition w32api.h "(__W32API_MAJOR_VERSION > 3) || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION >= 13)" ||
die "ERROR: avisynth and vfwcap_demuxer require w32api version 3.13 or later."; } die "ERROR: avisynth and vfwcap_indev require w32api version 3.13 or later."; }
fi fi
;; ;;
cygwin*) cygwin*)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment