generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Declare the g_strCodecVer variable as const

Browse Source 
Previously, the variable itself wasn't const (which meant that
it could be set to point to another const string instead).

By declaring it as const, gcc doesn't warn about it being unused,
and we can get rid of a workaround.
This commit is contained in:
Martin Storsjö 2015-01-04 21:00:23 +02:00
parent 7d5e88ffda
commit 3422d3b976
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec/api/svc/codec_ver.h
View File

@ -5,7 +5,7 @@
#include "codec_app_def.h"
static const OpenH264Version g_stCodecVersion = {1,3,0,0};
static const char* g_strCodecVer = "OpenH264 version:1.3.0.0";
static const char* const g_strCodecVer = "OpenH264 version:1.3.0.0";
#define OPENH264_MAJOR (1)
#define OPENH264_MINOR (3)

6
codec/build/generate_codec_ver.sh
View File

@ -28,11 +28,11 @@ echo "#include \"codec_app_def.h\"" >>codec_ver.h
echo "" >>codec_ver.h
echo "static const OpenH264Version g_stCodecVersion = {$1};"|tr '.' ',' >>codec_ver.h
echo "static const char* g_strCodecVer = \"OpenH264 version:$1\";" >>codec_ver.h
echo "static const char* const g_strCodecVer = \"OpenH264 version:$1\";" >>codec_ver.h
#if [ "$2"x = ""x ]; then
#echo "static const char* g_strCodecBuildNum = \"OpenH264 revision:$revision\";" >> codec_ver.h
#echo "static const char* const g_strCodecBuildNum = \"OpenH264 revision:$revision\";" >> codec_ver.h
#else
#echo "static const char* g_strCodecBuildNum = \"OpenH264 build:$2, OpenH264 revision:$revision\";" >> codec_ver.h
#echo "static const char* const g_strCodecBuildNum = \"OpenH264 build:$2, OpenH264 revision:$revision\";" >> codec_ver.h
#fi
echo "" >>codec_ver.h

1
codec/encoder/plus/src/welsEncoderExt.cpp
View File

@ -1228,7 +1228,6 @@ void WelsDestroySVCEncoder (ISVCEncoder* pEncoder) {
}
OpenH264Version WelsGetCodecVersion() {
(void) g_strCodecVer; // Avoid warnings about unused static variables
return g_stCodecVersion;
}