Skip to content

Commit

Permalink
version 1.2.0
Browse files Browse the repository at this point in the history
Changelog:
version 1.2.0    2013-05-27

- Better gui for the player example
- Dynamically change renderer engine
- Filter framework works. Filters on data and renderer support
- XV rendering support
- Fix some qmake project bugs
- Other features, bug fix, code refine
  • Loading branch information
wang-bin committed May 26, 2013
1 parent 096e58e commit 454c82f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
9 changes: 9 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
version 1.2.0 2013-05-27

- Better gui for the player example
- Dynamically change renderer engine
- Filter framework works. Filters on data and renderer support
- XV rendering support
- Fix some qmake project bugs
- Other features, bug fix, code refine

version 1.1.11 2013-03-15

- OpenGL support. Only rendering now.
Expand Down
2 changes: 1 addition & 1 deletion res/QtAV.rc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ BEGIN
BEGIN
BLOCK "000004b0"
BEGIN
VALUE "CompanyName", "Shanghai University & Kazo Vision & VIA | [email protected]"
VALUE "CompanyName", "Shanghai University | [email protected]"
VALUE "FileDescription", "Media library based on Qt & FFmpeg. https://github.com/wang-bin/QtAV"
VALUE "FileVersion", QTAV_VERSION_STR ".0"
VALUE "LegalCopyright", "Copyright (C) 2012-2013 WangBin"
Expand Down
4 changes: 2 additions & 2 deletions src/QtAV/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#define QTAV_VERSION_H

#define QTAV_MAJOR 1 //((QTAV_VERSION&0xff0000)>>16)
#define QTAV_MINOR 1 //((QTAV_VERSION&0xff00)>>8)
#define QTAV_PATCH 11 //(QTAV_VERSION&0xff)
#define QTAV_MINOR 2 //((QTAV_VERSION&0xff00)>>8)
#define QTAV_PATCH 0 //(QTAV_VERSION&0xff)


#define QTAV_VERSION_MAJOR(V) ((V & 0xff0000) >> 16)
Expand Down
2 changes: 1 addition & 1 deletion src/libQtAV.pri
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ NAME = QtAV
#!isEmpty(LIBQTAV_PRI_INCLUDED):error("libQtAV.pri already included")
eval(LIB$$upper($$NAME)_PRI_INCLUDED = 1)

LIB_VERSION = 1.1.11 #0.x.y may be wrong for dll
LIB_VERSION = 1.2.0 #0.x.y may be wrong for dll
isEmpty(STATICLINK): STATICLINK = 0 #1 or 0. use static lib or not

TEMPLATE += fakelib
Expand Down

0 comments on commit 454c82f

Please sign in to comment.