Skip to content

Commit d4c178d

Browse files
wang-binwang-bin
committed
License change to LGPL v2.1
1 parent dbc7be4 commit d4c178d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1412
-578
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ QtAV is a media playing library based on Qt and FFmpeg. It can help you to write
44
with less effort than ever before. Currently only a simple player is supplied. I will write a
55
stylish one based on QtAV in the feature.
66

7-
QtAV is free software licensed under the or GPL v3. If you use QtAV or its constituent libraries,
7+
QtAV is free software licensed under the term of LGPL v2.1. If you use QtAV or its constituent libraries,
88
you must adhere to the terms of the license in question.
99

1010
#### [Download binaries from sourceforge](https://sourceforge.net/projects/qtav/files)

‎examples/simpleplayer/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
Simple Player: this file is part of QtAV examples
33
Copyright (C) 2012-2013 Wang Bin <[email protected]>
44
5+
* This file is part of QtAV
6+
57
This program is free software: you can redistribute it and/or modify
68
it under the terms of the GNU General Public License as published by
79
the Free Software Foundation, either version 3 of the License, or

‎examples/videowall/VideoWall.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
VideoWall: this file is part of QtAV examples
33
Copyright (C) 2012-2013 Wang Bin <[email protected]>
44
5+
* This file is part of QtAV
6+
57
This program is free software: you can redistribute it and/or modify
68
it under the terms of the GNU General Public License as published by
79
the Free Software Foundation, either version 3 of the License, or

‎examples/videowall/VideoWall.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
VideoWall: this file is part of QtAV examples
33
Copyright (C) 2012-2013 Wang Bin <[email protected]>
44
5+
* This file is part of QtAV
6+
57
This program is free software: you can redistribute it and/or modify
68
it under the terms of the GNU General Public License as published by
79
the Free Software Foundation, either version 3 of the License, or

‎examples/videowall/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
VideoWall: this file is part of QtAV examples
33
Copyright (C) 2012-2013 Wang Bin <[email protected]>
44
5+
* This file is part of QtAV
6+
57
This program is free software: you can redistribute it and/or modify
68
it under the terms of the GNU General Public License as published by
79
the Free Software Foundation, either version 3 of the License, or

‎lgpl-2.1.txt

Lines changed: 502 additions & 0 deletions
Large diffs are not rendered by default.

‎res/QtAV.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ BEGIN
1515
BEGIN
1616
BLOCK "000004b0"
1717
BEGIN
18-
VALUE "CompanyName", "Shanghai University & Kazo Vision | [email protected]"
18+
VALUE "CompanyName", "Shanghai University & Kazo Vision & VIA | [email protected]"
1919
VALUE "FileDescription", "Media library based on Qt & FFmpeg. https://github.com/wang-bin/QtAV"
2020
VALUE "FileVersion", "1.1.7.0"
2121
VALUE "LegalCopyright", "Copyright (C) 2012-2013 WangBin"

‎src/AOPortAudio.cpp

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@
22
QtAV: Media play library based on Qt and FFmpeg
33
Copyright (C) 2012-2013 Wang Bin <[email protected]>
44
5-
This program is free software: you can redistribute it and/or modify
6-
it under the terms of the GNU General Public License as published by
7-
the Free Software Foundation, either version 3 of the License, or
8-
(at your option) any later version.
9-
10-
This program is distributed in the hope that it will be useful,
5+
* This file is part of QtAV
6+
7+
This library is free software; you can redistribute it and/or
8+
modify it under the terms of the GNU Lesser General Public
9+
License as published by the Free Software Foundation; either
10+
version 2.1 of the License, or (at your option) any later version.
11+
12+
This library is distributed in the hope that it will be useful,
1113
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14-
15-
You should have received a copy of the GNU General Public License
16-
along with this program. If not, see <http://www.gnu.org/licenses/>.
14+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
Lesser General Public License for more details.
16+
17+
You should have received a copy of the GNU Lesser General Public
18+
License along with this library; if not, write to the Free Software
19+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1720
******************************************************************************/
1821

1922

‎src/AVClock.cpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@
22
QtAV: Media play library based on Qt and FFmpeg
33
Copyright (C) 2012-2013 Wang Bin <[email protected]>
44
5-
This program is free software: you can redistribute it and/or modify
6-
it under the terms of the GNU General Public License as published by
7-
the Free Software Foundation, either version 3 of the License, or
8-
(at your option) any later version.
5+
* This file is part of QtAV
96
10-
This program is distributed in the hope that it will be useful,
7+
This library is free software; you can redistribute it and/or
8+
modify it under the terms of the GNU Lesser General Public
9+
License as published by the Free Software Foundation; either
10+
version 2.1 of the License, or (at your option) any later version.
11+
12+
This library is distributed in the hope that it will be useful,
1113
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
Lesser General Public License for more details.
1416
15-
You should have received a copy of the GNU General Public License
16-
along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
You should have received a copy of the GNU Lesser General Public
18+
License along with this library; if not, write to the Free Software
19+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1720
******************************************************************************/
1821

1922

‎src/AVDecoder.cpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@
22
QtAV: Media play library based on Qt and FFmpeg
33
Copyright (C) 2012-2013 Wang Bin <[email protected]>
44
5-
This program is free software: you can redistribute it and/or modify
6-
it under the terms of the GNU General Public License as published by
7-
the Free Software Foundation, either version 3 of the License, or
8-
(at your option) any later version.
5+
* This file is part of QtAV
96
10-
This program is distributed in the hope that it will be useful,
7+
This library is free software; you can redistribute it and/or
8+
modify it under the terms of the GNU Lesser General Public
9+
License as published by the Free Software Foundation; either
10+
version 2.1 of the License, or (at your option) any later version.
11+
12+
This library is distributed in the hope that it will be useful,
1113
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
Lesser General Public License for more details.
1416
15-
You should have received a copy of the GNU General Public License
16-
along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
You should have received a copy of the GNU Lesser General Public
18+
License along with this library; if not, write to the Free Software
19+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1720
******************************************************************************/
1821

1922
#include <QtAV/AVDecoder.h>

‎src/AVDemuxThread.cpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@
22
QtAV: Media play library based on Qt and FFmpeg
33
Copyright (C) 2012-2013 Wang Bin <[email protected]>
44
5-
This program is free software: you can redistribute it and/or modify
6-
it under the terms of the GNU General Public License as published by
7-
the Free Software Foundation, either version 3 of the License, or
8-
(at your option) any later version.
5+
* This file is part of QtAV
96
10-
This program is distributed in the hope that it will be useful,
7+
This library is free software; you can redistribute it and/or
8+
modify it under the terms of the GNU Lesser General Public
9+
License as published by the Free Software Foundation; either
10+
version 2.1 of the License, or (at your option) any later version.
11+
12+
This library is distributed in the hope that it will be useful,
1113
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
Lesser General Public License for more details.
1416
15-
You should have received a copy of the GNU General Public License
16-
along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
You should have received a copy of the GNU Lesser General Public
18+
License along with this library; if not, write to the Free Software
19+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1720
******************************************************************************/
1821

1922
#include <QtAV/AVDemuxThread.h>

‎src/AVDemuxer.cpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@
22
QtAV: Media play library based on Qt and FFmpeg
33
Copyright (C) 2012-2013 Wang Bin <[email protected]>
44
5-
This program is free software: you can redistribute it and/or modify
6-
it under the terms of the GNU General Public License as published by
7-
the Free Software Foundation, either version 3 of the License, or
8-
(at your option) any later version.
5+
* This file is part of QtAV
96
10-
This program is distributed in the hope that it will be useful,
7+
This library is free software; you can redistribute it and/or
8+
modify it under the terms of the GNU Lesser General Public
9+
License as published by the Free Software Foundation; either
10+
version 2.1 of the License, or (at your option) any later version.
11+
12+
This library is distributed in the hope that it will be useful,
1113
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
Lesser General Public License for more details.
1416
15-
You should have received a copy of the GNU General Public License
16-
along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
You should have received a copy of the GNU Lesser General Public
18+
License along with this library; if not, write to the Free Software
19+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1720
******************************************************************************/
1821

1922
#include <QtAV/AVClock.h>

‎src/AVOutput.cpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@
22
QtAV: Media play library based on Qt and FFmpeg
33
Copyright (C) 2012-2013 Wang Bin <[email protected]>
44
5-
This program is free software: you can redistribute it and/or modify
6-
it under the terms of the GNU General Public License as published by
7-
the Free Software Foundation, either version 3 of the License, or
8-
(at your option) any later version.
5+
* This file is part of QtAV
96
10-
This program is distributed in the hope that it will be useful,
7+
This library is free software; you can redistribute it and/or
8+
modify it under the terms of the GNU Lesser General Public
9+
License as published by the Free Software Foundation; either
10+
version 2.1 of the License, or (at your option) any later version.
11+
12+
This library is distributed in the hope that it will be useful,
1113
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
Lesser General Public License for more details.
1416
15-
You should have received a copy of the GNU General Public License
16-
along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
You should have received a copy of the GNU Lesser General Public
18+
License along with this library; if not, write to the Free Software
19+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1720
******************************************************************************/
1821

1922
#include <QtAV/AVOutput.h>

‎src/AVPlayer.cpp

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@
22
QtAV: Media play library based on Qt and FFmpeg
33
Copyright (C) 2012-2013 Wang Bin <[email protected]>
44
5-
This program is free software: you can redistribute it and/or modify
6-
it under the terms of the GNU General Public License as published by
7-
the Free Software Foundation, either version 3 of the License, or
8-
(at your option) any later version.
5+
* This file is part of QtAV
96
10-
This program is distributed in the hope that it will be useful,
7+
This library is free software; you can redistribute it and/or
8+
modify it under the terms of the GNU Lesser General Public
9+
License as published by the Free Software Foundation; either
10+
version 2.1 of the License, or (at your option) any later version.
11+
12+
This library is distributed in the hope that it will be useful,
1113
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
Lesser General Public License for more details.
1416
15-
You should have received a copy of the GNU General Public License
16-
along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
You should have received a copy of the GNU Lesser General Public
18+
License along with this library; if not, write to the Free Software
19+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1720
******************************************************************************/
1821

1922
#include <QtAV/AVPlayer.h>
@@ -59,9 +62,9 @@ AVPlayer::AVPlayer(QObject *parent) :
5962
QObject(parent),loaded(false),capture_dir("capture"),_renderer(0),_audio(0)
6063
,event_filter(0),video_capture(0)
6164
{
62-
qDebug("QtAV %s\nCopyright (C) 2012 Wang Bin <[email protected]>"
63-
"\nDistributed under GPLv3 or later"
64-
"\nShanghai University, China"
65+
qDebug("QtAV %s\nCopyright (C) 2012-2013 Wang Bin (aka. Lucas Wang) <[email protected]>"
66+
"\nDistributed under LGPL v2.1 or later"
67+
"\nShanghai University, Shanghai, China"
6568
, QTAV_VERSION_STR_LONG);
6669
/*
6770
* call stop() before the window(_renderer) closed to stop the waitcondition

‎src/AVThread.cpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@
22
QtAV: Media play library based on Qt and FFmpeg
33
Copyright (C) 2012-2013 Wang Bin <[email protected]>
44
5-
This program is free software: you can redistribute it and/or modify
6-
it under the terms of the GNU General Public License as published by
7-
the Free Software Foundation, either version 3 of the License, or
8-
(at your option) any later version.
5+
* This file is part of QtAV
96
10-
This program is distributed in the hope that it will be useful,
7+
This library is free software; you can redistribute it and/or
8+
modify it under the terms of the GNU Lesser General Public
9+
License as published by the Free Software Foundation; either
10+
version 2.1 of the License, or (at your option) any later version.
11+
12+
This library is distributed in the hope that it will be useful,
1113
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
Lesser General Public License for more details.
1416
15-
You should have received a copy of the GNU General Public License
16-
along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
You should have received a copy of the GNU Lesser General Public
18+
License along with this library; if not, write to the Free Software
19+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1720
******************************************************************************/
1821

1922
#include <QtAV/AVThread.h>

‎src/AudioDecoder.cpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@
22
QtAV: Media play library based on Qt and FFmpeg
33
Copyright (C) 2012-2013 Wang Bin <[email protected]>
44
5-
This program is free software: you can redistribute it and/or modify
6-
it under the terms of the GNU General Public License as published by
7-
the Free Software Foundation, either version 3 of the License, or
8-
(at your option) any later version.
5+
* This file is part of QtAV
96
10-
This program is distributed in the hope that it will be useful,
7+
This library is free software; you can redistribute it and/or
8+
modify it under the terms of the GNU Lesser General Public
9+
License as published by the Free Software Foundation; either
10+
version 2.1 of the License, or (at your option) any later version.
11+
12+
This library is distributed in the hope that it will be useful,
1113
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
Lesser General Public License for more details.
1416
15-
You should have received a copy of the GNU General Public License
16-
along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
You should have received a copy of the GNU Lesser General Public
18+
License along with this library; if not, write to the Free Software
19+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1720
******************************************************************************/
1821

1922
#include <QtAV/AudioDecoder.h>

‎src/AudioOutput.cpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@
22
QtAV: Media play library based on Qt and FFmpeg
33
Copyright (C) 2012-2013 Wang Bin <[email protected]>
44
5-
This program is free software: you can redistribute it and/or modify
6-
it under the terms of the GNU General Public License as published by
7-
the Free Software Foundation, either version 3 of the License, or
8-
(at your option) any later version.
5+
* This file is part of QtAV
96
10-
This program is distributed in the hope that it will be useful,
7+
This library is free software; you can redistribute it and/or
8+
modify it under the terms of the GNU Lesser General Public
9+
License as published by the Free Software Foundation; either
10+
version 2.1 of the License, or (at your option) any later version.
11+
12+
This library is distributed in the hope that it will be useful,
1113
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
14+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
Lesser General Public License for more details.
1416
15-
You should have received a copy of the GNU General Public License
16-
along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
You should have received a copy of the GNU Lesser General Public
18+
License along with this library; if not, write to the Free Software
19+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1720
******************************************************************************/
1821

1922
#include <QtAV/AudioOutput.h>

0 commit comments

Comments
 (0)