version 1.3.0

Changelog: - Selectable audio track - Multiple rendering target for 1 video support - Hardware decoding support(unstable): DXVA2 for windows, VA-API for x11(bad performance now) - Region of Interest(ROI) support, i.e. crop. - Filter support(Experimental) - Video eq: brightness, contrast, saturation - Repeat support - Mang api changes - QML: compatible with many QtMultiMedia APIs - build/install: check arch, fix wrong rpath and launch error on Mac, add installer - player: playlist, history, better online tv, etc.
ibooij · Dec 19, 2013 · e9512e2 · e9512e2
1 parent b3d8a09
commit e9512e2
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 13 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3  1,18 @@
 version 1.3.0    2013-12-19
 
 - Selectable audio track
 - Multiple rendering target for 1 video support
 - Hardware decoding support(unstable): DXVA2 for windows, VA-API for x11(bad performance now)
 - Region of Interest(ROI) support, i.e. crop.
 - Filter support(Experimental)
 - Video eq: brightness, contrast, saturation
 - Repeat support
 - Mang api changes
 - QML: compatible with many QtMultiMedia APIs
 - build/install: check arch, fix wrong rpath and launch error on Mac, add installer
 - player: playlist, history, better online tv, etc.
 
 
 version 1.2.4    2013-09-08
 
 - QML support(thanks theoribeiro <[email protected]>). Can replace some of qtmultimedia qml apps, e.g. qmlvideofx

diff --git a/QtAV.pro b/QtAV.pro
@@ -35,8  35,8 @@ unix {
 
 include(root.pri)
 
-PACKAGE_VERSION = 1.2.4
 PACKAGE_VERSION = 1.3.0
 PACKAGE_NAME= QtAV
 
 include(pack.pri)
-#packageSet(1.2.4, QtAV)
 #packageSet(1.3.0, QtAV)
diff --git a/README.md b/README.md
@@ -33,6  33,7 @@ QtAV can meet your most demands
 - Dynamically change render engine when playing.
 - Multiple video outputs for 1 player
 - Region of interest(ROI), i.e. video cropping
 - Video eq: brightness, contrast, saturation
 - QML support as a plugin
 - Compatiblity: QtAV can be built with both Qt4 and Qt5. QtAV supports
   both FFmpeg(>=0.9) and [Libav](http://libav.org).
@@ -59,7  60,7 @@ or [Libav](libav.org) (>=0.8) Latest version is recommanded.
 [![Libav](http://libav.org/libav-logo-text.png)](http://libav.org)
 
 2. [Qt 4 or 5](http://qt-project.org/downloads)  
-[![Qt](http://blog.qt.digia.com/wp-content/themes/qt_blog/images/Qt_master_logo_CMYK_noback.gif)](http://qt-project.org)
 [![Qt](http://qt-project.org/images/qt13a/Qt-logo.png)](http://qt-project.org)
 3. [PortAudio v19](http://www.portaudio.com/download.html)  
 [![PortAudio Logo](http://www.portaudio.com/images/portaudio_logo.png)](http://www.portaudio.com)[![PortAudio](http://www.portaudio.com/images/portaudio_logotext.png)](http://www.portaudio.com)
 
@@ -145,13  146,20 @@ For End Users
 
 An simple player can be found in examples. The command line options is
 
-    player [-vo qt|gl|d2d|gdi|xv] [url/path]
     player [-ao null] [-vo qt|gl|d2d|gdi|xv] [-vd "dxva[;vaapi[;ffmpeg]]"] [url|path|pipe:]
 
-You can choose a paint engine with _-vo_ option. For example, in windows that support Direct2D, you can run
 To disable audio output, add `-ao null`
 
 Choose a render engine with _-vo_ option(default is OpenGL). For example, in windows that support Direct2D, you can run
 
     player -vo d2d filename
 
-The default is Qt's paint engine.
 To select decoder, use `-vd` option. Value can be _dxva_, _vaapi_ and _ffmpeg_, or a list separated by `;` in priority order. For example:
 
     player -vd "dxva;ffmpeg" filename
 
 will use dxva if dxva can decode, otherwise ffmpeg will be used.
 
 
 #### Default Shortcuts
 
@@ -228,7  236,10 @@ Thanks
 
 [PayPal ![Paypal](http://www.paypal.com/en_US/i/btn/btn_donate_LG.gif)](https://sourceforge.net/p/qtav/wiki/Donate 捐赠)
 
-[![Gittip](https://www.gittip.com/assets/10.1.48/logo.png)](https://www.gittip.com/wang-bin)
 [![Support via Gittip](https://rawgithub.com/twolfson/gittip-badge/0.1.0/dist/gittip.png)](https://www.gittip.com/wang-bin)
 
 
 [Gittip ![Gittip](https://www.gittip.com/assets/10.1.51/logo.png)](https://www.gittip.com/wang-bin)
 
 - - -
 

diff --git a/config.tests/gentest.sh b/config.tests/gentest.sh
@@ -1,4  1,5 @@
-. ../scripts/functions.sh
 SCRIPT_DIR=${0%/*}
 . $SCRIPT_DIR/../scripts/functions.sh
 
 help_post(){
   echo  "This will create a test for $1. You may change the default value: \"#include <$1.h>\" in $1/main.cpp and \"LIBS  = -l$1\" in $1/$1.pro"
@@ -35,4  36,4 @@ int main()
 }
 EOF
 
-echo "test for $NAME created"
 echo "test for $NAME created"
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.4 #0.x.y may be wrong for dll
 LIB_VERSION = 1.3.0 #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
@@ -23,8  23,8 @@
 #define QTAV_VERSION_H
 
 #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_MINOR 3    //((QTAV_VERSION&0xff00)>>8)
 #define QTAV_PATCH 0    //(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.2.4 #0.x.y may be wrong for dll
 LIB_VERSION = 1.3.0 #0.x.y may be wrong for dll
 isEmpty(STATICLINK): STATICLINK = 0  #1 or 0. use static lib or not
 
 TEMPLATE  = fakelib