Merge pull request #2316 from pengyanhai/v1.5.3-Firefox39

Update plugin to v1.5.3
cisco · Dec 17, 2015 · 2706e36 · 2706e36
2 parents 01d9132 + ee9c398
commit 2706e36
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ GMP_API_BRANCH=Firefox39
 CCASFLAGS=$(CFLAGS)
 STATIC_LDFLAGS=-lstdc++
 
-VERSION=1.5.2
+VERSION=1.5.3
 SHAREDLIBVERSION=1
 
 ifeq (,$(wildcard $(SRC_PATH)gmp-api))

diff --git a/RELEASES b/RELEASES
@@ -1,6 +1,10 @@
 
 Releases
 -----------
+v1.5.3
+------
+- Fix GMP Plugin hang on Android devices
+
 v1.5.2
 ------
 - Fix GMP Plugin causing the Browser crash on Android

diff --git a/codec/api/svc/codec_ver.h b/codec/api/svc/codec_ver.h
@@ -4,12 +4,12 @@
 
 #include "codec_app_def.h"
 
-static const OpenH264Version g_stCodecVersion  = {1, 5, 2, 0};
-static const char* const g_strCodecVer  = "OpenH264 version:1.5.2.0";
+static const OpenH264Version g_stCodecVersion  = {1, 5, 3, 0};
+static const char* const g_strCodecVer  = "OpenH264 version:1.5.3.0";
 
 #define OPENH264_MAJOR (1)
 #define OPENH264_MINOR (5)
-#define OPENH264_REVISION (2)
+#define OPENH264_REVISION (3)
 #define OPENH264_RESERVED (0)
 
 #endif  // CODEC_VER_H
diff --git a/openh264.rc b/openh264.rc
@@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,2,0
- PRODUCTVERSION 1,5,2,0
+ FILEVERSION 1,5,3,0
+ PRODUCTVERSION 1,5,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,12 +43,12 @@ BEGIN
             VALUE "Comments", "Cisco OpenH264 codec"
             VALUE "CompanyName", "Cisco Systems Inc."
             VALUE "FileDescription", "Cisco OpenH264 codec"
-            VALUE "FileVersion", "1.5.2.0"
+            VALUE "FileVersion", "1.5.3.0"
             VALUE "InternalName", "openh264.dll"
             VALUE "LegalCopyright", "� 2011-2015 Cisco and/or its affiliates. All rights reserved."
             VALUE "OriginalFilename", "openh264.dll"
             VALUE "ProductName", "Cisco OpenH264 codec"
-            VALUE "ProductVersion", "1.5.2.0"
+            VALUE "ProductVersion", "1.5.3.0"
         END
     END
     BLOCK "VarFileInfo"