Created
January 11, 2013 21:09
-
-
Save adworacz/4513971 to your computer and use it in GitHub Desktop.
Diff to add libavcodec dependency to vapoursynth.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/INSTALL b/INSTALL | |
index b3814a7..8cbb454 100644 | |
--- a/INSTALL | |
+++ b/INSTALL | |
@@ -5,8 +5,8 @@ First, a couple of things to note: | |
* You need to be on Windows, Linux, or OS X. | |
* You need to have the QtCore libraries and headers installed. | |
-* You need to have the libraries and headers for libavutil | |
- and libswscale installed. | |
+* You need to have the libraries and headers for libavutil, | |
+ libswscale, and libavcodec installed. | |
* You need to have either GCC, Clang, MSVC, or ICC/ICL installed. | |
Both a C and C++ compiler are required. | |
* You need to have Yasm installed. | |
diff --git a/wscript b/wscript | |
index b18d026..faa8a98 100644 | |
--- a/wscript | |
+++ b/wscript | |
@@ -263,6 +263,10 @@ def configure(conf): | |
conf.check_cc(use = ['AVUTIL'], header_name = 'libavutil/avutil.h') | |
conf.check_cc(use = ['AVUTIL'], header_name = 'libavutil/avutil.h', function_name = 'avutil_license') | |
+ conf.check_cc(lib = 'avcodec') | |
+ conf.check_cc(use = ['AVCODEC'], header_name = 'libavcodec/avcodec.h') | |
+ conf.check_cc(use = ['AVCODEC'], header_name = 'libavcodec/avcodec.h', function_name = 'avcodec_license') | |
+ | |
conf.check_cc(lib = 'swscale') | |
conf.check_cc(use = ['SWSCALE'], header_name = 'libswscale/swscale.h') | |
conf.check_cc(use = ['SWSCALE'], header_name = 'libswscale/swscale.h', function_name = 'swscale_license') | |
@@ -323,7 +327,7 @@ def build(bld): | |
bld(features = 'c qxx asm', | |
includes = 'include', | |
- use = ['QTCORE', 'SWSCALE', 'AVUTIL'], | |
+ use = ['QTCORE', 'SWSCALE', 'AVUTIL', 'AVCODEC'], | |
source = bld.path.ant_glob(sources), | |
target = 'objs') |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
This is necessary in order to compile the src/core/vsresize.c file in Vapoursynth.