[FFmpeg-cvslog] Replace every usage of -lvfw32 with what is particularly necessary for that case : Avisynth -> -lavifil32 VFW Cap -> -lavicap32 Patch by kemuri < kemuri9 at gmail dot com>
kemuri
git at videolan.org
Mon Jun 4 12:34:52 CEST 2012
ffmpeg | branch: release/0.5 | kemuri <kemuri9 at gmail.com> | Sat Jan 23 20:42:00 2010 +0000| [f6147effd2e998007b30510f723ab75cd549b226] | committer: Derek Buitenhuis
Replace every usage of -lvfw32 with what is particularly necessary for that case: Avisynth -> -lavifil32 VFW Cap -> -lavicap32 Patch by kemuri <kemuri9 at gmail dot com>
Originally committed as revision 21410 to svn://svn.ffmpeg.org/ffmpeg/trunk
(cherry picked from commit a1b3c5a377976d21b9daa878265c6eada24c2543)
Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
Conflicts:
configure
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6147effd2e998007b30510f723ab75cd549b226
---
configure | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index c2da74a..61db28c 100755
--- a/configure
+++ b/configure
@@ -1132,7 +1132,7 @@ sdp_demuxer_deps="rtp_protocol mpegts_demuxer"
v4l_demuxer_deps="linux_videodev_h"
v4l2_demuxer_deps_any="linux_videodev2_h sys_videoio_h"
vfwcap_demuxer_deps="capCreateCaptureWindow"
-vfwcap_demuxer_extralibs="-lvfw32"
+vfwcap_demuxer_extralibs="-lavicap32"
x11_grab_device_demuxer_deps="x11grab XShmCreateImage"
x11_grab_device_demuxer_extralibs="-lX11 -lXext"
@@ -2022,7 +2022,7 @@ EOF
done
# these are off by default, so fail if requested and not available
-enabled avisynth && require2 vfw32 "windows.h vfw.h" AVIFileInit -lvfw32
+enabled avisynth && require2 vfw32 "windows.h vfw.h" AVIFileInit -lavifil32
enabled libamr_nb && require libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init -lamrnb -lm
enabled libamr_wb && require libamrwb amrwb/dec_if.h D_IF_init -lamrwb -lm
enabled libdirac && add_cflags $(pkg-config --cflags dirac) &&
@@ -2149,7 +2149,7 @@ check_header linux/videodev.h
check_header linux/videodev2.h
check_header sys/videoio.h
-check_func_headers "windows.h vfw.h" capCreateCaptureWindow -lvfw32
+check_func_headers "windows.h vfw.h" capCreateCaptureWindow -lavicap32
# check for ioctl_meteor.h, ioctl_bt848.h and alternatives
{ check_header dev/bktr/ioctl_meteor.h &&
More information about the ffmpeg-cvslog
mailing list