diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-20 23:29:19 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-20 23:55:23 +0300 |
| commit | 6c9dfa5a1b45a02e85c308e53bd39cd4a32826df (patch) | |
| tree | 2f1c48f927467eebb0d466b9e098ab383ed3819e /libavcodec/libopenh264enc.c | |
| parent | 87c4a80e563ae19fec482aaac635d48c16d5c114 (diff) | |
| parent | 440119b18836887d98c9e337c5911563bb43588c (diff) | |
Merge commit '440119b18836887d98c9e337c5911563bb43588c'
* commit '440119b18836887d98c9e337c5911563bb43588c':
libopenh264enc: Move a declaration of a variable into an ifdef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libopenh264enc.c')
| -rw-r--r-- | libavcodec/libopenh264enc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 9e7198ae0b..a20501ff92 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -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); |