diff options
| author | Matt Oliver <protogonoi@gmail.com> | 2022-06-09 23:27:08 +0000 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2022-06-11 14:15:16 +0200 |
| commit | dd5a0302d5286e66ca03a57770537d5afa4c7775 (patch) | |
| tree | 26740740b632cb48de3665dbd7cf38c7e19bd42b /libavcodec | |
| parent | 3b3c567ad3d45a3f5d90668a1dd32f11b89fc4b5 (diff) | |
avcodec/libx264: Set min build version to 158 for msvc
Was "[PATCH] libx264: Do not explicitly set X264_API_IMPORTS"
Setting X264_API_IMPORTS only affects msvc builds and it breaks
linking to static builds (although is required for shared builds).
This flag is set by x264 in its pkgconfig as required since build
158 (a615f027ed172e2dd5380e736d487aa858a0c4ff) from July 2019.
So this patch updates configure to require a newer x264 build that
correctly sets the imports flag.
The min version requirement of 158 is applied for msvc builds only.
This is also removing the check for 'libx264 without pkg-config'
which was left for compatibility reasons about 7 years ago when
the pkg-config check was introduced by commit
e06263ef1e0e172b2c76070b3dc739411af08e82.
Co-authored-by: softworkz <softworkz@hotmail.com>
Signed-off-by: softworkz <softworkz@hotmail.com>
Signed-off-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libx264.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 4ce3791ae8..14177b3016 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -37,10 +37,6 @@ #include "atsc_a53.h" #include "sei.h" -#if defined(_MSC_VER) -#define X264_API_IMPORTS 1 -#endif - #include <x264.h> #include <float.h> #include <math.h> |