Merge pull request cisco#1461 from sijchen/v1.2_release1

Update version.h and API doc and release note for v1.2
khaje · Oct 29, 2014 · ca0ed2a · ca0ed2a
2 parents 6e56e80 + be97ccb
commit ca0ed2a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/OpenH264_API_v1.2.0.docx b/OpenH264_API_v1.2.0.docx
diff --git a/RELEASES b/RELEASES
@@ -1,5 +1,16 @@
 
 Releases
+-----------
+v1.2.0
+------
+- Add and modify encoder APIs related to rate control and screen content encoding
+- Remove PauseFrame in encoder APIs
+- Improve rate control and compression ratio for screen content encoding
+- Improve error concealment algorithm
+- Improve validation of input parameters
+- Add ARM64 assembly
+- bug fixes
+
 -----------
 v1.1.0
 ------
@@ -15,6 +26,16 @@ Binaries
 These binary releases are distributed under this license:
 http://www.openh264.org/BINARY_LICENSE.txt
 
+v1.2.0
+------
+http://ciscobinary.openh264.org/libopenh264-1.2.0-android19.so.bz2
+http://ciscobinary.openh264.org/libopenh264-1.2.0-linux32.so.bz2
+http://ciscobinary.openh264.org/libopenh264-1.2.0-linux64.so.bz2
+http://ciscobinary.openh264.org/libopenh264-1.2.0-osx32.dylib.bz2
+http://ciscobinary.openh264.org/libopenh264-1.2.0-osx64.dylib.bz2
+http://ciscobinary.openh264.org/openh264-1.2.0-win32msvc.dll.bz2
+http://ciscobinary.openh264.org/openh264-1.2.0-win64msvc.dll.bz2
+
 v1.1.0
 ------
 http://ciscobinary.openh264.org/libopenh264-1.1.0-android19.so.bz2

diff --git a/codec/common/inc/version.h b/codec/common/inc/version.h
@@ -1,6 +1,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define VERSION_NUMBER "openh264 default: 1.1"
+#define VERSION_NUMBER "openh264 default: 1.2"
 
 #endif // VERSION_H