diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-20 21:15:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-20 21:15:25 +0100 |
| commit | 87c4a80e563ae19fec482aaac635d48c16d5c114 (patch) | |
| tree | e2a658c33901e22dc00432e750fa40ae46bfa956 | |
| parent | 9cbaf5849b217342b9850bd39e91d3c83f8f2ed1 (diff) | |
| parent | bba02479260d0e7dec8c530a7e75a1c7aa53c06e (diff) | |
| download | ffmpeg-87c4a80e563ae19fec482aaac635d48c16d5c114.tar.gz | |
Merge commit 'bba02479260d0e7dec8c530a7e75a1c7aa53c06e'
* commit 'bba02479260d0e7dec8c530a7e75a1c7aa53c06e':
libopenh264enc: Remove a workaround for silencing warnings about unused variables in the OpenH264 header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libopenh264enc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 07262b96dc..9e7198ae0b 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -70,7 +70,6 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) SEncParamExt param = { 0 }; int err = AVERROR_UNKNOWN; av_unused OpenH264Version libver; - (void)g_strCodecVer; // Avoid warnings due to unused static members from codec_ver.h // 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 |