diff --git a/QtAV.pro b/QtAV.pro index 916596753..a5230de75 100644 --- a/QtAV.pro +++ b/QtAV.pro @@ -56,8 +56,8 @@ runConfigTests() } -PACKAGE_VERSION = 1.3.2 +PACKAGE_VERSION = 1.3.4 PACKAGE_NAME= QtAV include(pack.pri) -#packageSet(1.3.2, QtAV) +#packageSet(1.3.4, QtAV) diff --git a/README.md b/README.md index 9896a2690..239ca8f9f 100644 --- a/README.md +++ b/README.md @@ -1,245 +1,224 @@ -# [QtAV](http://wang-bin.github.io/QtAV) - -QtAV is a media playing library based on Qt and FFmpeg. It can help you to write a player -with less effort than ever before. - -QtAV has been added to FFmpeg projects page [http://ffmpeg.org/projects.html](http://ffmpeg.org/projects.html) - -**QtAV is free software licensed under the term of LGPL v2.1. The player example is licensed under GPL v3. If you use QtAV or its constituent libraries, -you must adhere to the terms of the license in question.** - - -#### [Web site](http://wang-bin.github.io/QtAV) -#### [Download binaries from sourceforge](https://sourceforge.net/projects/qtav) -#### [Source code on github](https://github.com/wang-bin/QtAV) - -### Features - -QtAV can meet your most demands - -- Hardware decoding suppprt: DXVA2, VAAPI(buggy now), CedarX(e.g. pcDuino), CUDA(the 1st player support CUDA on linux?) -- Seek, pause/resume -- Video capture in rgb and yuv format -- OSD and custom filters -- Aspect ratio -- Transform video using GraphicsItemRenderer. (rotate, shear, etc) -- Playing frame by frame (currently support forward playing) -- Playing speed control. At any speed. -- Variant streams: locale file, http, rtsp, etc. -- Playing music -- Choose audio channel -- Choose media stream, e.g. play a desired audio track -- Volume control -- Multiple render engine support. Currently supports QPainter, GDI+, Direct2D, XV and OpenGL(and ES2). -- 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, hue -- Support renderering 16-bit YUV (e.g. Hi10P) using OpenGL and OpenGL ES2. (The 1st player/library support in ES2? VLC, XBMC, mplayer does not support now) -- QML support as a plugin. Most playback APIs are compatible with QtMultiMedia module -- Compatiblity: QtAV can be built with both Qt4 and Qt5. QtAV supports - both FFmpeg(>=0.9) and [Libav](http://libav.org). - - -### Extensible Framework (work in progress) - - QtAV currently uses FFmpeg to decode video, convert image and audio data, and uses PortAudio to play - sound. Every part in QtAV is designed to be extensible. For example, you can write your decoder, audio output for particular platform. [Here is a very good example to add cedar hardware accelerated decoder for A13-OLinuXino](https://github.com/mireq/QtAV/commit/d7b428c1dae66b2a85b7a6bfa7b253980b5b963c) - - -# For Developers - -#### Requirements - -1. [FFmpeg](http://ffmpeg.org) (>=0.9)Latest version is recommanded. - -[![FFmpeg](http://ffmpeg.org/ffmpeg-logo.png)](http://ffmpeg.org) - -or [Libav](libav.org) (>=0.9) 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://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) - -or OpenAL ![OpenAL](http://upload.wikimedia.org/wikipedia/zh/2/28/OpenAL_logo.png "OpenAL") - -**The required development files for MinGW can be found in sourceforge -page: [depends](https://sourceforge.net/projects/qtav/files/depends)** - -#### Build - -You can build QtAV with many compilers and on many platforms. You can use gcc, clang, vc to compile it. -See the wiki [Build QtAV](https://github.com/wang-bin/QtAV/wiki/Build-QtAV) and [QtAV Build Configurations](https://github.com/wang-bin/QtAV/wiki/QtAV-Build-Configurations) - -Here is a brief guide: - -It's recommend not to build in source dir. - - cd your_build_dir - qmake QtAV_project_dir/QtAV.pro - make - -qmake will run check the required libraries at the first time, so you must make sure those libraries can be found by compiler. -Then qmake will create a cache file _.qmake.cache_ in your build dir. Cache file stores the check results, for example, whether portaudio is available. If you want to recheck, run `qmake QtAV_project_dir/QtAV.pro -config recheck` - -_WARNING_: If you are in windows mingw with sh.exe environment, you may need run qmake twice.(ISSUE #18) - - - -#### How To Write a Player - -Wrtie a media player using QtAV is quite easy. - - GLWidgetRenderer renderer; - renderer.show(); - AVPlayer player; - player.setRenderer(&renderer); - player.play("test.avi"); - -For more detail to using QtAV, see the wiki [Use QtAV In Your Project](https://github.com/wang-bin/QtAV/wiki/Use-QtAV-In-Your-Projects) or examples. - - -QtAV can also be used in **Qml** - - import QtQuick 2.0 - import QtAV 1.3 - Item { - VideoOutput { - anchors.fill: parent - source: player - } - AVPlayer { //or MediaPlayer - id: player - source: "test.mp4" - } - MouseArea { - anchors.fill: parent - onClicked: player.play() - } - } - -### How To Contribute - -- [Fork](https://github.com/wang-bin/QtAV/fork) QtAV project on github and make a branch. Commit in that branch, and push, then create a pull request to be reviewed and merged. -- [Create an issue](https://github.com/wang-bin/QtAV/issues/new) if you have any problem when using QtAV or you find a bug, etc. -- What you can do: translation, writing document, find or fix bugs, give your idea for this project etc. - -#### Contributors - -- Wang Bin(Lucas Wang) : creator, maintainer -- Stefan Ladage : QIODevice support. Wiki about build QtAV for iOS. -- Miroslav Bendik : Cedarv support. Better qmlvideofx appearance -- Dimitri E. Prado : issue 70 -- theoribeiro : initial QML support -- Vito Covito : interrupt callback - -For End Users -------------- - -#### Player Usage - -An simple player can be found in examples. The command line options is - - player [-ao null] [-vo qt|gl|d2d|gdi|xv] [-vd "dxva[cuda[;vaapi[;ffmpeg]]]"] [--ffmpeg-log] [url|path|pipe:] - -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 - -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. - -QMLPlayer has less options now. To use DXVA decoder: - - QMLPlayer-vd "DXVA;FFmpeg" filename - - -#### Default Shortcuts - -- Double click: fullscreen switch -- Ctrl+O: open a file -- Space: pause/continue -- F: fullscreen on/off -- I: switch display quality -- T: stays on top on/off -- N: show next frame. Continue the playing by pressing "Space" -- O: OSD -- P: replay -- Q/ESC: quit -- S: stop -- R: switch aspect ratio -- M: mute on/off -- Up / Down: volume + / - -- Ctrl+Up/Down: speed + / - -- -> / <-: seek forward / backward -- Crtl+Wheel: zoom in/out -- Drag and drop a media file to player - - -# TODO - -Read https://github.com/wang-bin/QtAV/wiki/TODO for detail. - -Screenshots ----------- - -Use QtAV in QML with OpenGL shaders(example is from qtmultimedia. But qtmultimedia is replaced by QtAV) - -![Alt text](https://sourceforge.net/p/qtav/screenshot/QtAV-QML-Shader.jpg "QtAV QML Shaders") - -QtAV on Mac OS X - -![Alt text](https://sourceforge.net/p/qtav/screenshot/mac.jpg "player on OSX") - -IP camera using QtAV. OS: Fedora 18 (some developers from Italy http://www.selcomsrl.eu/) - -![Alt text](https://sourceforge.net/projects/qtav/screenshots/ip_camera.jpg "ip camera") - -QMLPlayer on ubuntu - -![QMLPlayer](https://sourceforge.net/p/qtav/screenshot/QMLPlayer%2BQtAV.jpg "QMLPlayer") - -Video Wall - -![Alt text](https://sourceforge.net/p/qtav/screenshot/videowall.png "video wall") - - - -*** -### [Donate 资助](https://sourceforge.net/p/qtav/wiki/Donate%20%E6%8D%90%E8%B5%A0) - -软件由我一人利用空余学习和工作时间开发。如果您觉得不错，可以考虑资助一下 - -#####What are the financial needs of QtAV? -- Buy hardware for developing and testing purpose. (lack of AMD card now) - -Thanks - -Now I have received 1050 RMB(about 160$) and 100$ - -[![Alipay](https://img.alipay.com/sys/personalprod/style/mc/top-logo.png)](https://me.alipay.com/lucaswang) - -[PayPal ![Paypal](http://www.paypal.com/en_US/i/btn/btn_donate_LG.gif)](http://wang-bin.github.io/qtav.org#donate) - -[![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) - -- - - - - - -> Copyright © Wang Bin wbsecg1@gmail.com - -> Shanghai University->S3 Graphics, Shanghai, China - -> 2013-01-21 +# [QtAV](http://wang-bin.github.io/QtAV) + +QtAV is a multimedia playback library based on Qt and FFmpeg. It can help you to write a player +with less effort than ever before. + +QtAV has been added to FFmpeg projects page [http://ffmpeg.org/projects.html](http://ffmpeg.org/projects.html) + +**QtAV is free software licensed under the term of LGPL v2.1. The player example is licensed under GPL v3. If you use QtAV or its constituent libraries, +you must adhere to the terms of the license in question.** + + +#### [Web site](http://wang-bin.github.io/QtAV) +#### [Download binaries from sourceforge](https://sourceforge.net/projects/qtav) +#### [Source code on github](https://github.com/wang-bin/QtAV) + +### Features + +QtAV can meet your most demands + +- Hardware decoding suppprt: DXVA2, VAAPI, CedarX, CUDA(the 1st player support CUDA on linux?) +- OpenGL and ES2 support for Hi10P and other 16-bit YUV videos (The 1st player/library support in ES2? VLC, XBMC, mplayer does not support now) +- Seek, pause/resume +- Video capture in rgb and yuv format +- OSD and custom filters +- Transform video using GraphicsItemRenderer. (rotate, shear, etc) +- Playing frame by frame (currently support forward playing) +- Playing speed control. At any speed. +- Variant streams: locale file, http, rtsp, etc. +- Choose audio channel +- Choose media stream, e.g. play a desired audio track +- Multiple render engine support. Currently supports QPainter, GDI+, Direct2D, XV and OpenGL(and ES2). +- 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, hue +- QML support as a plugin. Most playback APIs are compatible with QtMultiMedia module +- Compatiblity: QtAV can be built with both Qt4 and Qt5. QtAV supports + both FFmpeg(>=0.9) and [Libav >= 9.0](http://libav.org). + + +### Extensible Framework (work in progress) + + QtAV currently uses FFmpeg to decode video, convert image and audio data, and uses PortAudio to play + sound. Every part in QtAV is designed to be extensible. For example, you can write your decoder, audio output for particular platform. [Here is a very good example to add cedar hardware accelerated decoder for A13-OLinuXino](https://github.com/mireq/QtAV/commit/d7b428c1dae66b2a85b7a6bfa7b253980b5b963c) + + +# For Developers + +#### Requirements + +1. [FFmpeg](http://ffmpeg.org) (>=0.9)Latest version is recommanded. + +[![FFmpeg](http://ffmpeg.org/ffmpeg-logo.png)](http://ffmpeg.org) + +or [Libav](libav.org) (>=0.9) 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://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) + +or OpenAL ![OpenAL](http://upload.wikimedia.org/wikipedia/zh/2/28/OpenAL_logo.png "OpenAL") + +**The required development files for MinGW can be found in sourceforge +page: [depends](https://sourceforge.net/projects/qtav/files/depends)** + +#### Build + +See the wiki [Build QtAV](https://github.com/wang-bin/QtAV/wiki/Build-QtAV) and [QtAV Build Configurations](https://github.com/wang-bin/QtAV/wiki/QtAV-Build-Configurations) + + + +#### How To Write a Player + +Wrtie a media player using QtAV is quite easy. + + GLWidgetRenderer renderer; + renderer.show(); + AVPlayer player; + player.setRenderer(&renderer); + player.play("test.avi"); + +For more detail to using QtAV, see the wiki [Use QtAV In Your Project](https://github.com/wang-bin/QtAV/wiki/Use-QtAV-In-Your-Projects) or examples. + + +QtAV can also be used in **Qml** + + import QtQuick 2.0 + import QtAV 1.3 + Item { + VideoOutput { + anchors.fill: parent + source: player + } + AVPlayer { //or MediaPlayer + id: player + source: "test.mp4" + } + MouseArea { + anchors.fill: parent + onClicked: player.play() + } + } + +### How To Contribute + +- [Fork](https://github.com/wang-bin/QtAV/fork) QtAV project on github and make a branch. Commit in that branch, and push, then create a pull request to be reviewed and merged. +- [Create an issue](https://github.com/wang-bin/QtAV/issues/new) if you have any problem when using QtAV or you find a bug, etc. +- What you can do: translation, write document, wiki, find or fix bugs, give your idea for this project etc. + +#### Contributors + +- Wang Bin(Lucas Wang) : creator, maintainer +- skaman: aspect ratio from stream +- Stefan Ladage : QIODevice support. Wiki about build QtAV for iOS. +- Miroslav Bendik : Cedarv support. Better qmlvideofx appearance +- Dimitri E. Prado : issue 70 +- theoribeiro : initial QML support +- Vito Covito : interrupt callback + +For End Users +------------- + +#### Player Usage + +An simple player can be found in examples. The command line options is + + player [-ao null] [-vo qt|gl|d2d|gdi|xv] [-vd "dxva[cuda[;vaapi[;ffmpeg]]]"] [--ffmpeg-log] [url|path|pipe:] + +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 + +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. + +QMLPlayer has less options now. To use DXVA decoder: + + QMLPlayer-vd "DXVA;FFmpeg" filename + + +#### Default Shortcuts + +- Double click: fullscreen switch +- Ctrl+O: open a file +- Space: pause/continue +- F: fullscreen on/off +- I: switch display quality +- T: stays on top on/off +- N: show next frame. Continue the playing by pressing "Space" +- O: OSD +- P: replay +- Q/ESC: quit +- S: stop +- R: switch aspect ratio +- M: mute on/off +- Up / Down: volume + / - +- Ctrl+Up/Down: speed + / - +- -> / <-: seek forward / backward +- Crtl+Wheel: zoom in/out +- Drag and drop a media file to player + + +# TODO + +Read https://github.com/wang-bin/QtAV/wiki/TODO for detail. + +Screenshots +---------- + +Use QtAV in QML with OpenGL shaders(example is from qtmultimedia. But qtmultimedia is replaced by QtAV) + +![Alt text](https://sourceforge.net/p/qtav/screenshot/QtAV-QML-Shader.jpg "QtAV QML Shaders") + +QtAV on Mac OS X + +![Alt text](https://sourceforge.net/p/qtav/screenshot/mac.jpg "player on OSX") + +QMLPlayer on ubuntu + +![QMLPlayer](https://sourceforge.net/p/qtav/screenshot/QMLPlayer%2BQtAV.jpg "QMLPlayer") + +Video Wall + +![Alt text](https://sourceforge.net/p/qtav/screenshot/videowall.png "video wall") + + + +*** +### [Donate 资助](https://sourceforge.net/p/qtav/wiki/Donate%20%E6%8D%90%E8%B5%A0) + +软件由我一人利用空余学习和工作时间开发。如果您觉得不错，可以考虑资助一下 + +#####What are the financial needs of QtAV? +- Buy hardware for developing and testing purpose. (lack of AMD card now) + +Thanks + +Now I have received 1150 RMB and 100$ + + +[PayPal ![Paypal](http://www.paypal.com/en_US/i/btn/btn_donate_LG.gif)](http://wang-bin.github.io/qtav.org#donate) + +[![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) + +- - - + + + +> Copyright © Wang Bin wbsecg1@gmail.com + +> Shanghai University->S3 Graphics, Shanghai, China + +> 2013-01-21 diff --git a/doc/TODO.md b/doc/TODO.md index 3831a7a02..1d28f35d3 100644 --- a/doc/TODO.md +++ b/doc/TODO.md @@ -42,6 +42,7 @@ ref: qtmmwidgets - OpenVG or GL text renderering, dwrite text renderering - D3D and DDraw: not that important. +- D3D surface=>gl texture: http://stackoverflow.com/questions/7686619/mixing-directx-and-opengl http://developer.download.nvidia.com/opengl/specs/WGL_NV_DX_interop.txt https://github.com/tliron/opengl-3d-vision-bridge/blob/master/opengl_3dv.c #### Filters - Integrate libavfilter @@ -64,6 +65,7 @@ ref: qtmmwidgets #### Hardware decoding - Better CUDA support. No CPU copy, all done in gpu from decoding to filtering to renderering. - DXVA HD +- DXVA2 + d3d11: https://bugzilla.mozilla.org/show_bug.cgi?id=875247 - SSE4 optimized copy. Ref: VLC - OMX - Cedarv enhancement if I have a device to test diff --git a/examples/QMLPlayer/qml/QMLPlayer/main.qml b/examples/QMLPlayer/qml/QMLPlayer/main.qml index 8d12f2bae..bb80f40c3 100644 --- a/examples/QMLPlayer/qml/QMLPlayer/main.qml +++ b/examples/QMLPlayer/qml/QMLPlayer/main.qml @@ -193,7 +193,7 @@ Rectangle { onLinkActivated: Qt.openUrlExternally(link) } function helpText() { - return "

QMLPlayer based on QtAV 1.3.3

" + return "

QMLPlayer based on QtAV 1.3.4

" + "

Distributed under the terms of LGPLv2.1 or later.

" + "

Copyright (C) 2012-2014 Wang Bin (aka. Lucas Wang) wbsecg1@gmail.com

" + "

Shanghai University->S3 Graphics, Shanghai, China

" diff --git a/examples/common/libcommon.pri b/examples/common/libcommon.pri index 462cd39ba..70434101e 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.3 #0.x.y may be wrong for dll +LIB_VERSION = 1.3.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/qml/libQmlAV.pri b/qml/libQmlAV.pri index 17c19a14e..c8c550c13 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.3 #0.x.y may be wrong for dll +LIB_VERSION = 1.3.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/qtc_packaging/ifw/packages/com.qtav.product.dev/meta/package.xml b/qtc_packaging/ifw/packages/com.qtav.product.dev/meta/package.xml index 15b9ca0cc..cf6e08344 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.3-0 - 2014-04-20 + 1.3.4-0 + 2014-05-30 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 3fe76b449..657e97d94 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.3-0 - 2014-04-20 + 1.3.4-0 + 2014-05-30 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 8f936b4b5..d5b005558 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.3-0 - 2014-04-20 + 1.3.4-0 + 2014-05-30 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 1b84e2b3e..b5bd2b45c 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.3-0 - 2014-04-20 + 1.3.4-0 + 2014-05-30 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 9f225c480..da6cec04b 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.3-0 - 2014-04-20 + 1.3.4-0 + 2014-05-30 com.qtav.product diff --git a/src/QtAV/version.h b/src/QtAV/version.h index 7182ae8f9..e18d7df67 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 3 //((QTAV_VERSION&0xff00)>>8) -#define QTAV_PATCH 3 //(QTAV_VERSION&0xff) +#define QTAV_PATCH 4 //(QTAV_VERSION&0xff) #define QTAV_VERSION_MAJOR(V) ((V & 0xff0000) >> 16) diff --git a/src/libQtAV.pri b/src/libQtAV.pri index 6efddd8ee..f09c2c6ce 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.3 #0.x.y may be wrong for dll +LIB_VERSION = 1.3.4 #0.x.y may be wrong for dll isEmpty(STATICLINK): STATICLINK = 0 #1 or 0. use static lib or not TEMPLATE += fakelib