From fd9027c62f5e38601167544263a23576a80ffbdf Mon Sep 17 00:00:00 2001 From: wang-bin Date: Thu, 6 Nov 2014 12:57:18 +0800 Subject: [PATCH] version 1.4.1 Changelog: - More QtMultimedia compatible QML playback API - Debian package support. Now you can build on ubuntu>=14.04 using debuild - Subtitle: libass renderering support. Dynamically change FFmpeg parser and libass - Log level control support without changing any Qt logging functions (qDebug, qWarning etc.) - Video orientation support in renderers - Bug fix: video frame with alpha value. video stream start time >0. OpenAL can not close correctly... - QML only: video preview. - players: config UI in QMLPlayer. Video preview on progress bar. --- Changelog | 13 +++++++++++++ QtAV.pro | 4 ++-- debian/changelog | 9 +++++++++ examples/common/libcommon.pri | 2 +- qml/libQmlAV.pri | 2 +- qml/libQmlAV.pro | 2 +- qtc_packaging/ifw/build.sh | 0 .../packages/com.qtav.product.dev/meta/package.xml | 4 ++-- .../com.qtav.product.examples/meta/package.xml | 4 ++-- .../com.qtav.product.player/meta/package.xml | 4 ++-- .../com.qtav.product.runtime/meta/package.xml | 4 ++-- .../ifw/packages/com.qtav.product/meta/package.xml | 4 ++-- src/QtAV/version.h | 2 +- src/libQtAV.pri | 2 +- tools/install_sdk/install_sdk.pro | 2 +- 15 files changed, 40 insertions(+), 18 deletions(-) mode change 100644 => 100755 qtc_packaging/ifw/build.sh diff --git a/Changelog b/Changelog index 7c6feb73d..c43cf40df 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,16 @@ +version 1.4.1 2014-11-06 + +Changelog: +- More QtMultimedia compatible QML playback API +- Debian package support. Now you can build on ubuntu>=14.04 using debuild +- Subtitle: libass renderering support. Dynamically change FFmpeg parser and libass +- Log level control support without changing any Qt logging functions (qDebug, qWarning etc.) +- Video orientation support in renderers +- Bug fix: video frame with alpha value. video stream start time >0. OpenAL can not close correctly... +- QML only: video preview. +- players: config UI in QMLPlayer. Video preview on progress bar. + + version 1.4.0 2014-09-10 Changelog: diff --git a/QtAV.pro b/QtAV.pro index 871f8b876..57c84aad5 100644 --- a/QtAV.pro +++ b/QtAV.pro @@ -60,8 +60,8 @@ runConfigTests() } -PACKAGE_VERSION = 1.4.0 +PACKAGE_VERSION = 1.4.1 PACKAGE_NAME= QtAV include(pack.pri) -#packageSet(1.4.0, QtAV) +#packageSet(1.4.1, QtAV) diff --git a/debian/changelog b/debian/changelog index 38e8b75f0..dd6967077 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +qtav (1.4.1) unstable; urgency=low + + * libass support + * More QML APIs compatible with QtMultimedia + * Log level control + * Video preview + + -- Wang Bin Thu, 6 Nov 2014 13:22:33 +0800 + qtav (1.4.0) unstable; urgency=low * Initial release. (Closes: #737016) diff --git a/examples/common/libcommon.pri b/examples/common/libcommon.pri index ec8c1654d..c8deb9389 100644 --- a/examples/common/libcommon.pri +++ b/examples/common/libcommon.pri @@ -48,7 +48,7 @@ NAME = common } eval(LIB$$upper($$NAME)_PRI_INCLUDED = 1) -LIB_VERSION = 1.4.0 #0.x.y may be wrong for dll +LIB_VERSION = 1.4.1 #0.x.y may be wrong for dll ios: STATICLINK=1 isEmpty(STATICLINK): STATICLINK = 0 #1 or 0. use static lib or not diff --git a/qml/libQmlAV.pri b/qml/libQmlAV.pri index fb127ffb0..2bd46882f 100644 --- a/qml/libQmlAV.pri +++ b/qml/libQmlAV.pri @@ -48,7 +48,7 @@ NAME = QmlAV } eval(LIB$$upper($$NAME)_PRI_INCLUDED = 1) -LIB_VERSION = 1.4.0 #0.x.y may be wrong for dll +LIB_VERSION = 1.4.1 #0.x.y may be wrong for dll ios: STATICLINK=1 isEmpty(STATICLINK): STATICLINK = 0 #1 or 0. use static lib or not diff --git a/qml/libQmlAV.pro b/qml/libQmlAV.pro index 29be6c5e6..3e94b2e94 100644 --- a/qml/libQmlAV.pro +++ b/qml/libQmlAV.pro @@ -54,7 +54,7 @@ QMAKE_EXTRA_COMPILERS += extra_copy # EXTRA_COPY_FILES = $$qtav_qml.files QMAKE_WRITE_DEFAULT_RC = 1 -QMAKE_TARGET_COMPANY = "Shanghai University->S3 Graphics | wbsecg1@gmail.com" +QMAKE_TARGET_COMPANY = "Shanghai University->S3 Graphics->Deepin | wbsecg1@gmail.com" QMAKE_TARGET_DESCRIPTION = "Multimedia playback framework based on Qt & FFmpeg. http://www.qtav.org" QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2014 WangBin, wbsecg1@gmail.com" QMAKE_TARGET_PRODUCT = "QtAV player" diff --git a/qtc_packaging/ifw/build.sh b/qtc_packaging/ifw/build.sh old mode 100644 new mode 100755 diff --git a/qtc_packaging/ifw/packages/com.qtav.product.dev/meta/package.xml b/qtc_packaging/ifw/packages/com.qtav.product.dev/meta/package.xml index fb62b868e..668220fb3 100644 --- a/qtc_packaging/ifw/packages/com.qtav.product.dev/meta/package.xml +++ b/qtc_packaging/ifw/packages/com.qtav.product.dev/meta/package.xml @@ -2,8 +2,8 @@ Development files Install QtAV headers and lib. - 1.4.0-0 - 2014-09-09 + 1.4.1-0 + 2014-11-06 com.qtav.product.dev script diff --git a/qtc_packaging/ifw/packages/com.qtav.product.examples/meta/package.xml b/qtc_packaging/ifw/packages/com.qtav.product.examples/meta/package.xml index 6d6905812..c39e4d8ed 100644 --- a/qtc_packaging/ifw/packages/com.qtav.product.examples/meta/package.xml +++ b/qtc_packaging/ifw/packages/com.qtav.product.examples/meta/package.xml @@ -2,8 +2,8 @@ Examples Install QtAV examples. - 1.4.0-0 - 2014-09-09 + 1.4.1-0 + 2014-11-06 com.qtav.product.examples script diff --git a/qtc_packaging/ifw/packages/com.qtav.product.player/meta/package.xml b/qtc_packaging/ifw/packages/com.qtav.product.player/meta/package.xml index 2c5e10b45..c5e9a9f4d 100644 --- a/qtc_packaging/ifw/packages/com.qtav.product.player/meta/package.xml +++ b/qtc_packaging/ifw/packages/com.qtav.product.player/meta/package.xml @@ -2,8 +2,8 @@ Player Default player. - 1.4.0-0 - 2014-09-09 + 1.4.1-0 + 2014-11-06 com.qtav.product.player true true diff --git a/qtc_packaging/ifw/packages/com.qtav.product.runtime/meta/package.xml b/qtc_packaging/ifw/packages/com.qtav.product.runtime/meta/package.xml index 7a029e562..919331a65 100644 --- a/qtc_packaging/ifw/packages/com.qtav.product.runtime/meta/package.xml +++ b/qtc_packaging/ifw/packages/com.qtav.product.runtime/meta/package.xml @@ -2,8 +2,8 @@ Runtime library Install QtAV runtime library. - 1.4.0-0 - 2014-09-09 + 1.4.1-0 + 2014-11-06 com.qtav.product.runtime zh_CN.qm diff --git a/qtc_packaging/ifw/packages/com.qtav.product/meta/package.xml b/qtc_packaging/ifw/packages/com.qtav.product/meta/package.xml index 45d6d79ea..7a0cd0130 100644 --- a/qtc_packaging/ifw/packages/com.qtav.product/meta/package.xml +++ b/qtc_packaging/ifw/packages/com.qtav.product/meta/package.xml @@ -2,8 +2,8 @@ QtAV Install QtAV multimedia library - 1.4.0-0 - 2014-09-09 + 1.4.1-0 + 2014-11-06 com.qtav.product diff --git a/src/QtAV/version.h b/src/QtAV/version.h index ae7e8ba32..482446796 100644 --- a/src/QtAV/version.h +++ b/src/QtAV/version.h @@ -24,7 +24,7 @@ #define QTAV_MAJOR 1 //((QTAV_VERSION&0xff0000)>>16) #define QTAV_MINOR 4 //((QTAV_VERSION&0xff00)>>8) -#define QTAV_PATCH 0 //(QTAV_VERSION&0xff) +#define QTAV_PATCH 1 //(QTAV_VERSION&0xff) #define QTAV_VERSION_MAJOR(V) ((V & 0xff0000) >> 16) diff --git a/src/libQtAV.pri b/src/libQtAV.pri index b0d937ce9..d9a656e0c 100644 --- a/src/libQtAV.pri +++ b/src/libQtAV.pri @@ -48,7 +48,7 @@ NAME = QtAV } eval(LIB$$upper($$NAME)_PRI_INCLUDED = 1) -LIB_VERSION = 1.4.0 #0.x.y may be wrong for dll +LIB_VERSION = 1.4.1 #0.x.y may be wrong for dll ios: STATICLINK=1 isEmpty(STATICLINK): STATICLINK = 0 #1 or 0. use static lib or not diff --git a/tools/install_sdk/install_sdk.pro b/tools/install_sdk/install_sdk.pro index 85cd8def2..05b576843 100644 --- a/tools/install_sdk/install_sdk.pro +++ b/tools/install_sdk/install_sdk.pro @@ -14,7 +14,7 @@ PROJECTROOT = $$PWD/../.. include($$PROJECTROOT/common.pri) preparePaths($$OUT_PWD/../../out) -VERSION = 1.4.0 +VERSION = 1.4.1 # windows: Qt5AV.dll, not Qt1AV.dll !mac_framework: VERSION = $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}