diff --git a/Changelog b/Changelog
index 4307860d3..ec1f4679e 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,26 @@
+version 1.3.1 2014-01-27
+
+- Initial OpenAL support.
+- Fix hardware decoding crashes: seeking, packet loss(e.g. bad network)
+- Allwinner's CedarX hardware decoding support. Thanks Miroslav Bendik.
+- FFmpeg log and error handling. New class: AVError
+- AVDictionary support for decoder and demuxer. API: AVPlayer::setOptionsForXXX()
+- Fix crash on app exit
+- Fix Hi10bits crash
+- Build:
+ * fix XXX_EXPORT macro confliction.
+ * configurable qmake project etc.
+- QMLPlayer: better UI
+- player:
+ * wheel to zoom in/out.
+ * apply decoder without restart.
+ * exit on main window close.
+ * move EventHandler to player.
+- Installer: ubuntu support.
+- Screen saver for OSX, X11. Improve windows
+
+
+
version 1.3.0 2013-12-19
- Selectable audio track
diff --git a/QtAV.pro b/QtAV.pro
index 67df93b57..c194d47c0 100644
--- a/QtAV.pro
+++ b/QtAV.pro
@@ -54,8 +54,8 @@ runConfigTests()
}
-PACKAGE_VERSION = 1.3.0
+PACKAGE_VERSION = 1.3.1
PACKAGE_NAME= QtAV
include(pack.pri)
-#packageSet(1.3.0, QtAV)
+#packageSet(1.3.1, QtAV)
diff --git a/README.md b/README.md
index 6cbccf4b6..274f19a45 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ you must adhere to the terms of the license in question.**
QtAV can meet your most demands
-- Hardware decoding suppprt(not stable): DXVA2, VAAPI(buggy now)
+- Hardware decoding suppprt: DXVA2, VAAPI(buggy now), CedarX(e.g. pcDuino)
- Seek, pause/resume
- Video capture
- OSD and custom filters
diff --git a/examples/common/libcommon.pri b/examples/common/libcommon.pri
index 96951de09..3caba97e1 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.3.0 #0.x.y may be wrong for dll
+LIB_VERSION = 1.3.1 #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/qml/libQmlAV.pri b/qml/libQmlAV.pri
index a91266432..a72447037 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.3.0 #0.x.y may be wrong for dll
+LIB_VERSION = 1.3.1 #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/qml/libQmlAV.pro b/qml/libQmlAV.pro
index 4f05b026b..377504ace 100644
--- a/qml/libQmlAV.pro
+++ b/qml/libQmlAV.pro
@@ -19,7 +19,7 @@ message($$BUILD_DIR)
QML_FILES = $$PWD/Video.qml
# TODO: why add more files e.g. qmldir cause make error?
plugin.files = $$DESTDIR/$$qtSharedLib($$NAME)
-plugin.path = $$BUILD_DIR/bin/qml/QtAV/ #TODO: Qt install dir
+plugin.path = $$BUILD_DIR/bin/QtAV/ #TODO: Qt install dir
#plugin.depends = #makefile target
#windows: copy /y file1+file2+... dir. need '+'
for(f, plugin.files) {
diff --git a/qtc_packaging/ifw/config/config.xml b/qtc_packaging/ifw/config/config.xml
index 6419f71f3..76838d5b2 100644
--- a/qtc_packaging/ifw/config/config.xml
+++ b/qtc_packaging/ifw/config/config.xml
@@ -1,7 +1,7 @@
QtAV
- 1.3.0
+ 1.3.1
QtAV Installer
wbsecg1@gmail.com
https://github.com/wang-bin/QtAV
@@ -16,4 +16,4 @@
QtAV
@rootDir@/QtAV
@rootDir@/QtAV
-
\ No newline at end of file
+
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 adafc0b89..caaf67f2e 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.3.0-0
- 2013-11-24
+ 1.3.1-0
+ 2014-01-27
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 2d3fe0229..bb2e1d826 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.3.0-0
- 2013-11-24
+ 1.3.1-0
+ 2014-01-27
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 b05610530..be5894462 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.3.0-0
- 2013-11-24
+ 1.3.1-0
+ 2014-01-27
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 f882b00eb..0001ab33b 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.3.0-0
- 2013-11-24
+ 1.3.1-0
+ 2014-01-27
com.qtav.product.runtime
zh_CN.qm
@@ -12,4 +12,4 @@
true
true
8
-
\ No newline at end of file
+
\ No newline at end of file
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 edbc45c3e..1ed3377e5 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.3.0-0
- 2013-11-24
+ 1.3.1-0
+ 2014-01-27
com.qtav.product
@@ -12,4 +12,4 @@
zh_CN.qm
true
-
\ No newline at end of file
+
diff --git a/src/QtAV/version.h b/src/QtAV/version.h
index dbf57e56b..3c87b5584 100644
--- a/src/QtAV/version.h
+++ b/src/QtAV/version.h
@@ -1,6 +1,6 @@
/******************************************************************************
QtAV: Media play library based on Qt and FFmpeg
- Copyright (C) 2012-2013 Wang Bin
+ Copyright (C) 2012-2014 Wang Bin
* This file is part of QtAV
@@ -24,7 +24,7 @@
#define QTAV_MAJOR 1 //((QTAV_VERSION&0xff0000)>>16)
#define QTAV_MINOR 3 //((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 f4aabac3b..f00590deb 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.3.0 #0.x.y may be wrong for dll
+LIB_VERSION = 1.3.1 #0.x.y may be wrong for dll
isEmpty(STATICLINK): STATICLINK = 0 #1 or 0. use static lib or not
TEMPLATE += fakelib