Skip to content

Commit

Permalink
version 1.1.8
Browse files Browse the repository at this point in the history
Changelog
- LGPL version 2.1
- better Qt5 support
- better synchronisation and seeking
- crash fixed when getting stream info
- crash fixed when replaying a music
- drag & drop, simple internal gui and internal event filter
- videowall works better
  • Loading branch information
wang-bin committed Feb 6, 2013
1 parent 7edf2a6 commit ea6688e
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 7 deletions.
11 changes: 11 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
version 1.1.8 2013-02-06

- LGPL version 2.1
- better Qt5 support
- better synchronisation and seeking
- crash fixed when getting stream info
- crash fixed when replaying a music
- drag & drop, simple internal gui and internal event filter
- videowall works better


version 1.1.7 2013-01-30

- scale image without qt support!
Expand Down
8 changes: 4 additions & 4 deletions res/QtAV.rc
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
//IDI_ICON1 ICON DISCARDABLE "QtAV.ico"

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,1,7,0
PRODUCTVERSION 1,1,7,0
FILEVERSION 1,1,8,0
PRODUCTVERSION 1,1,8,0
FILEFLAGS 0x0L
FILEFLAGSMASK 0x3fL
FILEOS 0x00040004L
Expand All @@ -17,12 +17,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Shanghai University & Kazo Vision & VIA | [email protected]"
VALUE "FileDescription", "Media library based on Qt & FFmpeg. https://github.com/wang-bin/QtAV"
VALUE "FileVersion", "1.1.7.0"
VALUE "FileVersion", "1.1.8.0"
VALUE "LegalCopyright", "Copyright (C) 2012-2013 WangBin"
VALUE "InternalName", "QtAV"
VALUE "OriginalFilename", "QtAV.dll"
VALUE "ProductName", "QtAV"
VALUE "ProductVersion", "1.1.7.0"
VALUE "ProductVersion", "1.1.8.0"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion src/QtAV/QtAV_Global.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

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

#define QTAV_VERSION_CHK(major, minor, patch) \
(((major&0xff)<<16) | ((minor&0xff)<<8) | (patch&0xff))
Expand Down
4 changes: 2 additions & 2 deletions 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.7 #0.x.y may be wrong for dll
LIB_VERSION = 1.1.8 #0.x.y may be wrong for dll
isEmpty(STATICLINK): STATICLINK = 0 #1 or 0. use static lib or not

TEMPLATE += fakelib
Expand Down Expand Up @@ -107,7 +107,7 @@ QMAKE_LFLAGS_RPATH += #will append to rpath dir

#TEMPLATE = lib
VERSION = $$LIB_VERSION
TARGET = $$PROJECT_TARGETNAME
#TARGET = $$PROJECT_TARGETNAME ##?
DESTDIR= $$PROJECT_LIBDIR

CONFIG *= create_prl #
Expand Down

0 comments on commit ea6688e

Please sign in to comment.