mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-09 16:48:16 +00:00
Merge commit '440119b18836887d98c9e337c5911563bb43588c'
* commit '440119b18836887d98c9e337c5911563bb43588c': libopenh264enc: Move a declaration of a variable into an ifdef Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
6c9dfa5a1b
@ -69,13 +69,12 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
|
||||
SVCContext *s = avctx->priv_data;
|
||||
SEncParamExt param = { 0 };
|
||||
int err = AVERROR_UNKNOWN;
|
||||
av_unused OpenH264Version libver;
|
||||
|
||||
// Mingw GCC < 4.7 on x86_32 uses an incorrect/buggy ABI for the WelsGetCodecVersion
|
||||
// function (for functions returning larger structs), thus skip the check in those
|
||||
// configurations.
|
||||
#if !defined(_WIN32) || !defined(__GNUC__) || !ARCH_X86_32 || AV_GCC_VERSION_AT_LEAST(4, 7)
|
||||
libver = WelsGetCodecVersion();
|
||||
OpenH264Version libver = WelsGetCodecVersion();
|
||||
if (memcmp(&libver, &g_stCodecVersion, sizeof(libver))) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Incorrect library version loaded\n");
|
||||
return AVERROR(EINVAL);
|
||||
|
Loading…
Reference in New Issue
Block a user