shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1696 from mstorsjo/add-header-const

Declare the g_strCodecVer variable as const

--- a/codec/api/svc/codec_ver.h

+++ b/codec/api/svc/codec_ver.h

@@ -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)

--- a/codec/build/generate_codec_ver.sh

+++ b/codec/build/generate_codec_ver.sh

@@ -28,11 +28,11 @@

 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

--- a/codec/encoder/plus/src/welsEncoderExt.cpp

+++ b/codec/encoder/plus/src/welsEncoderExt.cpp

@@ -1228,7 +1228,6 @@

 }

 OpenH264Version WelsGetCodecVersion() {

-  (void) g_strCodecVer; // Avoid warnings about unused static variables

   return g_stCodecVersion;

 }