[FFmpeg-cvslog] libopenh264enc: Move a declaration of a variable into an ifdef
Martin Storsjö
git at videolan.org
Tue Jan 20 21:55:53 CET 2015
ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Jan 8 00:03:36 2015 +0200| [440119b18836887d98c9e337c5911563bb43588c] | committer: Martin Storsjö
libopenh264enc: Move a declaration of a variable into an ifdef
This avoids needing an attribute for silencing warnings about
it being unused.
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=440119b18836887d98c9e337c5911563bb43588c
---
libavcodec/libopenh264enc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
index 2781ab1..57343ce 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);
More information about the ffmpeg-cvslog
mailing list