Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
6fe419bf
Commit
6fe419bf
authored
Jun 11, 2013
by
Timothy Gu
Committed by
Michael Niedermayer
Jun 14, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
doc/general: Make the license status of the Android libraries clearer
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
cef42ded
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
3 deletions
+8
-3
general.texi
doc/general.texi
+8
-3
No files found.
doc/general.texi
View file @
6fe419bf
...
@@ -24,7 +24,7 @@ instructions. To enable using OpenJPEG in FFmpeg, pass @code{--enable-libopenjp
...
@@ -24,7 +24,7 @@ instructions. To enable using OpenJPEG in FFmpeg, pass @code{--enable-libopenjp
@file
{
./configure
}
.
@file
{
./configure
}
.
@section OpenCORE
and VisualOn
libraries
@section OpenCORE
, VisualOn, and Fraunhofer
libraries
Spun off Google Android sources, OpenCore, VisualOn and Fraunhofer
Spun off Google Android sources, OpenCore, VisualOn and Fraunhofer
libraries provide encoders for a number of audio codecs.
libraries provide encoders for a number of audio codecs.
...
@@ -32,9 +32,14 @@ libraries provide encoders for a number of audio codecs.
...
@@ -32,9 +32,14 @@ libraries provide encoders for a number of audio codecs.
@float NOTE
@float NOTE
OpenCORE and VisualOn libraries are under the Apache License 2.0
OpenCORE and VisualOn libraries are under the Apache License 2.0
(see @url
{
http://www.apache.org/licenses/LICENSE-2.0
}
for details), which is
(see @url
{
http://www.apache.org/licenses/LICENSE-2.0
}
for details), which is
incompatible
with
the LGPL version 2.1 and GPL version 2. You have to
incompatible
to
the LGPL version 2.1 and GPL version 2. You have to
upgrade FFmpeg's license to LGPL version 3 (or if you have enabled
upgrade FFmpeg's license to LGPL version 3 (or if you have enabled
GPL components, GPL version 3) to use it.
GPL components, GPL version 3) by passing @code
{
--enable-version3
}
to configure in
order to use it.
The Fraunhofer AAC library is licensed under a license incompatible to the GPL
and is not known to be compatible to the LGPL. Therefore, you have to pass
@code
{
--enable-nonfree
}
to configure to use it.
@end float
@end float
@subsection OpenCORE AMR
@subsection OpenCORE AMR
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment