version 1.2.4

Changelog: - QML support(thanks theoribeiro <[email protected]>). Can replace some of qtmultimedia qml apps, e.g. qmlvideofx - Fix build for FFmpeg >= 0.9, libav >= 0.8 - Channel can be choosed by user: original, stero, left, right, centre(mono) - OSD for GL ES2 renderer - player: statistics viewer, disable screensaver on widows when playing Signed-off-by: wang-bin <[email protected]>
iHaD · Sep 8, 2013 · 88c1117 · 88c1117
1 parent d346fd4
commit 88c1117
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,12 @@
+version 1.2.3    2013-09-08
+
+- QML support(thanks theoribeiro <[email protected]>). Can replace some of qtmultimedia qml apps, e.g. qmlvideofx
+- Fix build for FFmpeg >= 0.9, libav >= 0.8
+- Channel can be choosed by user: original, stero, left, right, centre(mono)
+- OSD for GL ES2 renderer
+- player: statistics viewer, disable screensaver on widows when playing
+
+
 version 1.2.3    2013-08-01
 
 - FFmpeg/libav avresample support

diff --git a/QtAV.pro b/QtAV.pro
@@ -1,6 +1,7 @@
 TEMPLATE = subdirs
 CONFIG -= ordered
 SUBDIRS = libqtav examples tests
+
 greaterThan(QT_MAJOR_VERSION, 4) {
   qtHaveModule(quick) {
     SUBDIRS += libqmlav
@@ -31,8 +32,8 @@ unix {
 
 include(root.pri)
 
-PACKAGE_VERSION = 1.2.3
+PACKAGE_VERSION = 1.2.4
 PACKAGE_NAME= QtAV
 
 include(pack.pri)
-#packageSet(1.2.0, QtAV)
+#packageSet(1.2.4, QtAV)
diff --git a/qml/libQmlAV.pri b/qml/libQmlAV.pri
@@ -48,7 +48,7 @@ NAME = QmlAV
 }
 eval(LIB$$upper($$NAME)_PRI_INCLUDED = 1)
 
-LIB_VERSION = 1.2.3 #0.x.y may be wrong for dll
+LIB_VERSION = 1.2.4 #0.x.y may be wrong for dll
 isEmpty(STATICLINK): STATICLINK = 0  #1 or 0. use static lib or not
 
 TEMPLATE += fakelib

diff --git a/src/QtAV/version.h b/src/QtAV/version.h
@@ -22,9 +22,9 @@
 #ifndef QTAV_VERSION_H
 #define QTAV_VERSION_H
 
-#define QTAV_MAJOR 1	//((QTAV_VERSION&0xff0000)>>16)
-#define QTAV_MINOR 2	//((QTAV_VERSION&0xff00)>>8)
-#define QTAV_PATCH 3	//(QTAV_VERSION&0xff)
+#define QTAV_MAJOR 1    //((QTAV_VERSION&0xff0000)>>16)
+#define QTAV_MINOR 2    //((QTAV_VERSION&0xff00)>>8)
+#define QTAV_PATCH 4    //(QTAV_VERSION&0xff)
 
 
 #define QTAV_VERSION_MAJOR(V) ((V & 0xff0000) >> 16)
@@ -45,7 +45,7 @@
 /* the following are compile time version */
 /* C++11 requires a space between literal and identifier */
 static const char* const qtav_version_string = TOSTR(QTAV_MAJOR) "." TOSTR(QTAV_MINOR) "." TOSTR(QTAV_PATCH) "(" __DATE__ ", " __TIME__ ")";
-#define QTAV_VERSION_STR		TOSTR(QTAV_MAJOR) "." TOSTR(QTAV_MINOR) "." TOSTR(QTAV_PATCH)
-#define QTAV_VERSION_STR_LONG	QTAV_VERSION_STR "(" __DATE__ ", " __TIME__ ")"
+#define QTAV_VERSION_STR        TOSTR(QTAV_MAJOR) "." TOSTR(QTAV_MINOR) "." TOSTR(QTAV_PATCH)
+#define QTAV_VERSION_STR_LONG   QTAV_VERSION_STR "(" __DATE__ ", " __TIME__ ")"
 
 #endif // QTAV_VERSION_H
diff --git a/src/libQtAV.pri b/src/libQtAV.pri
@@ -48,7 +48,7 @@ NAME = QtAV
 }
 eval(LIB$$upper($$NAME)_PRI_INCLUDED = 1)
 
-LIB_VERSION = 1.2.3 #0.x.y may be wrong for dll
+LIB_VERSION = 1.2.4 #0.x.y may be wrong for dll
 isEmpty(STATICLINK): STATICLINK = 0  #1 or 0. use static lib or not
 
 TEMPLATE += fakelib