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.
hcxiong · Nov 6, 2014 · fd9027c · fd9027c
1 parent 7e0bef4
commit fd9027c
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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 <[email protected]> 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
@@ -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
@@ -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
@@ -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 | [email protected]"
 QMAKE_TARGET_COMPANY = "Shanghai University->S3 Graphics->Deepin | [email protected]"
 QMAKE_TARGET_DESCRIPTION = "Multimedia playback framework based on Qt & FFmpeg. http://www.qtav.org"
 QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2014 WangBin, [email protected]"
 QMAKE_TARGET_PRODUCT = "QtAV player"

diff --git a/qtc_packaging/ifw/build.sh b/qtc_packaging/ifw/build.sh
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
@@ -2,8 2,8 @@
  <Package>
  <DisplayName>Development files</DisplayName>
  <Description>Install QtAV headers and lib.</Description>
- <Version>1.4.0-0</Version>
- <ReleaseDate>2014-09-09</ReleaseDate>
  <Version>1.4.1-0</Version>
  <ReleaseDate>2014-11-06</ReleaseDate>
  <Name>com.qtav.product.dev</Name>
  <Default>script</Default>
  <Script>installscript.qs</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
@@ -2,8 2,8 @@
  <Package>
  <DisplayName>Examples</DisplayName>
  <Description>Install QtAV examples.</Description>
- <Version>1.4.0-0</Version>
- <ReleaseDate>2014-09-09</ReleaseDate>
  <Version>1.4.1-0</Version>
  <ReleaseDate>2014-11-06</ReleaseDate>
  <Name>com.qtav.product.examples</Name>
  <Default>script</Default>
  <Script>installscript.qs</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
@@ -2,8 2,8 @@
  <Package>
  <DisplayName>Player</DisplayName>
  <Description>Default player.</Description>
- <Version>1.4.0-0</Version>
- <ReleaseDate>2014-09-09</ReleaseDate>
  <Version>1.4.1-0</Version>
  <ReleaseDate>2014-11-06</ReleaseDate>
  <Name>com.qtav.product.player</Name>
  <Default>true</Default>
  <ForcedInstallation>true</ForcedInstallation>

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
@@ -2,8 2,8 @@
  <Package>
  <DisplayName>Runtime library</DisplayName>
  <Description>Install QtAV runtime library.</Description>
- <Version>1.4.0-0</Version>
- <ReleaseDate>2014-09-09</ReleaseDate>
  <Version>1.4.1-0</Version>
  <ReleaseDate>2014-11-06</ReleaseDate>
  <Name>com.qtav.product.runtime</Name>
  <Translations>
  <Translation>zh_CN.qm</Translation>

diff --git 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 @@
  <Package>
  <DisplayName>QtAV</DisplayName>
  <Description>Install QtAV multimedia library</Description>
- <Version>1.4.0-0</Version>
- <ReleaseDate>2014-09-09</ReleaseDate>
  <Version>1.4.1-0</Version>
  <ReleaseDate>2014-11-06</ReleaseDate>
  <Name>com.qtav.product</Name>
  <Licenses>
  <License name="LGPL v2.1" file="lgpl-2.1.txt" />

diff --git 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
@@ -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
@@ -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}