virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
80,056 Commits 37 Branches 400 Tags 464 MiB
a20646bb24
Commit Graph

67 Commits

Author SHA1 Message Date
Timothy Gu
9ba54c1b82 avcodec: Remove libaacplus 
TODO: bump minor

It's inferior in quality to fdk-aac and has an arguably more problematic
license.

As early as 2012, a HydrogenAudio user reported:

> It has however one huge advantage: much better quality at low bitrates than
> faac and libaacplus.

(https://hydrogenaud.io/index.php?PHPSESSID=ckiq394pdglka0kj2fin6ij8t7&topic=95989.msg804633#msg804633)

I myself have made a few spectrograms for a comparison of the two
encoders as well. The FDK output is consistently better than the
libaacplus one, in all bitrates I tested.

libaacplus license is 3GPP + LGPLv2. 3GPP copyright notice is completely
proprietory, as follows:

> No part may be reproduced except as authorized by written permission.
>
> The copyright and the foregoing restriction extend to reproduction in
> all media.
>
> © 2008, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TTA, TTC).
>
> All rights reserved.

(The latest 26410-d00 zip from 3GPP has the same notice, but the copyright
year is changed to 2015)

The copyright part of the FDK AAC license (section 2) is a copyleft
license that permits redistribution under certain conditions (and
therefore the LGPL + libfdk-aac combination is not prohibited by
configure):

> Redistribution and use in source and binary forms, with or without
> modification, are permitted without payment of copyright license fees
> provided that you satisfy the following conditions:
>
> You must retain the complete text of this software license in
> redistributions of the FDK AAC Codec or your modifications thereto in
> source code form.
>
> You must retain the complete text of this software license in the
> documentation and/or other materials provided with redistributions of
> the FDK AAC Codec or your modifications thereto in binary form.
>
> You must make available free of charge copies of the complete source
> code of the FDK AAC Codec and your modifications thereto to recipients
> of copies in binary form.
>
> The name of Fraunhofer may not be used to endorse or promote products
> derived from this library without prior written permission.
>
> You may not charge copyright license fees for anyone to use, copy or
> distribute the FDK AAC Codec software or your modifications thereto.
>
> Your modified versions of the FDK AAC Codec must carry prominent
> notices stating that you changed the software and the date of any
> change. For modified versions of the FDK AAC Codec, the term
> "Fraunhofer FDK AAC Codec Library for Android" must be replaced by the
> term "Third-Party Modified Version of the Fraunhofer FDK AAC Codec
> Library for Android."
 2016-01-29 17:14:37 -08:00
Hendrik Leppkes
4e01566941 Merge commit 'b0e8651a2a84553d08fbb2f7cb9697bd64fb1b55' 
* commit 'b0e8651a2a84553d08fbb2f7cb9697bd64fb1b55':
  doc: Amend the MSYS2 Documentation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-12-07 14:18:41 +01:00
Hendrik Leppkes
7c4d405d40 Merge commit '6b7df14251c49331ae7efd4811ec21f4415ccdb5' 
* commit '6b7df14251c49331ae7efd4811ec21f4415ccdb5':
  doc: Document better how to use MSYS2

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-11-29 15:33:52 +01:00
Luca Barbato
b0e8651a2a doc: Amend the MSYS2 Documentation 
Explain better which environment is discouraged and mention the
shortcuts names.
 2015-11-26 10:55:35 +01:00
Luca Barbato
6b7df14251 doc: Document better how to use MSYS2 2015-11-23 13:05:09 +01:00
Martin Storsjö
6d3081e6c3 doc: Remove the now unnecessary remark about PATH and link.exe 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-27 10:44:31 +03:00
Michael Niedermayer
46f01e4133 Merge commit '6d3081e6c374ff7da12b07ed33d1662be1b32dbc' 
* commit '6d3081e6c374ff7da12b07ed33d1662be1b32dbc':
  doc: Remove the now unnecessary remark about PATH and link.exe

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-27 12:50:10 +02:00
Michael Niedermayer
9b41bf5c3d Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6' 
* commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6':
  tests: drop bc dependency

Conflicts:
	tests/fate-run.sh

See: d47eeff274
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-21 12:08:31 +01:00
Clément Bœsch
a982c5d74f tests: drop bc dependency 
We already have a dependency on awk and bc is sometimes not found in the
base system.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-21 11:17:45 +02:00
Nicolas George
b491751409 doc: set documentencoding on toplevel texi files. 
Fix double UTF-8 encoding on output files.
makeinfo / texi2any does not seem to provide a way of setting
it globally for toplevel files.
 2015-02-19 11:30:30 +01:00
Derek Buitenhuis
6c906ded38 doc/platform: Reference only MSYS2 and MinGW-w64 
It's better to steer users at these, since they are both better
and more alive than the mingw.org versions.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2015-01-21 13:58:02 +00:00
Derek Buitenhuis
da9bffaf08 doc/platform: Reference only MSYS2 and MinGW-w64 
It's better to steer users at these, since they are both better
and more alive than the mingw.org versions.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2015-01-21 13:57:03 +00:00
Timothy Gu
17ad5fbb8a Use makeinfo to generate html doc for the new website 
texi2html is deprecated by upstream in favor of makeinfo/texi2any. See:

- https://www.gnu.org/software/texinfo/manual/texinfo/html_node/texi2html.html
- https://wiki.debian.org/Texi2htmlTransition
- https://lists.debian.org/debian-devel/2013/05/msg01516.html

This is actually two separate changes.

Based on a patch by Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>.

Fixes Trac ticket #3232.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2014-09-04 02:34:20 +02:00
Michael Niedermayer
dac096cf39 Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830' 
* commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830':
  build: Support executable only ldflags

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-22 02:45:45 +02:00
Luca Barbato
bb0babd705 build: Support executable only ldflags 
The options is useful to build position-independent executables on
hardened systems (e.g. Android L and Gentoo Hardened).
 2014-07-21 22:18:35 +02:00
Michael Niedermayer
e8a966e361 Merge commit '33a7b453a8e1f090c694ea4f36769dc837be88f0' 
* commit '33a7b453a8e1f090c694ea4f36769dc837be88f0':
  doc: mention option to mix shared/static libraries

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 23:47:19 +02:00
Andrew Kelley
33a7b453a8 doc: mention option to mix shared/static libraries 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-07-09 09:57:10 -04:00
Michael Niedermayer
a125f87ac4 Merge commit '463a7cde563fd805864c48a76dd1b03fc24671ed' 
* commit '463a7cde563fd805864c48a76dd1b03fc24671ed':
  Differentiate assembler and assembly in documentation and comments

Conflicts:
	configure
	doc/platform.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 01:30:35 +02:00
Diego Biurrun
463a7cde56 Differentiate assembler and assembly in documentation and comments 
The language and the program that consumes the language are not the same.
 2014-06-22 23:15:14 +02:00
Michael Niedermayer
b5c6b23acd doc/platform: mention that yuvis gas-preprocessor is currently missing some changes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 23:08:41 +01:00
Michael Niedermayer
675a66a93b doc: switch github urls to https 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 23:05:26 +01:00
Michael Niedermayer
835f41376d Merge commit 'd15c536123a44362ace6299c391a492c90b83fc7' 
* commit 'd15c536123a44362ace6299c391a492c90b83fc7':
  doc: Point to the correct, actually maintained gas-preprocessor repo

Conflicts:
	doc/platform.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 23:02:56 +01:00
Martin Storsjö
d15c536123 doc: Point to the correct, actually maintained gas-preprocessor repo 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-03-12 20:43:55 +02:00
Derek Buitenhuis
ec0b0c2b58 doc/platform: Update to reflect current MSVC build situation 
Also update the C99 converter URL, since it uses GitHub Releases
to host the binaries now.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-11-27 13:39:42 +00:00
Derek Buitenhuis
fa515c2088 doc/platform: Update to reflect current MSVC build situation 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-11-27 13:39:03 +00:00
Michael Niedermayer
bad8f04b04 Merge commit 'b0ce601c160c87349d093d7e542b5c752754f598' 
* commit 'b0ce601c160c87349d093d7e542b5c752754f598':
  doc/platform: Add info about ICL

Conflicts:
	doc/platform.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-25 10:46:52 +02:00
Derek Buitenhuis
b0ce601c16 doc/platform: Add info about ICL 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-06-24 13:06:01 -04:00
Michael Niedermayer
f8201cc18b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc/platform: Remove part about dllimport
  vp8: Fix pthread_cond and pthread_mutex leaks

Conflicts:
	doc/platform.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-31 11:31:19 +02:00
Derek Buitenhuis
f2f57d1679 doc/platform: Remove part about dllimport 
Only deprecated things need this at all anymore, as we have functions
to access them or they are no longer needed.

The document should not encourage use of deprecated APIs.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-03-30 13:52:02 -04:00
Derek Buitenhuis
130cefc9dc doc/platform: Fix 10l typo 
This error was somehow missed for months.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-02-13 18:41:37 -05:00
Carl Eugen Hoyos
c29c7c1470 The c99-to-c89 binaries are now hosted on videolan.org. 2013-01-14 16:28:44 +01:00
Carl Eugen Hoyos
2e08a82d5e Fix the path to the C99-to-C89 Converter & Wrapper to the only existing repository. 
Ronald deleted his public c99-to-c89 repository today.
 2012-11-22 00:46:14 +01:00
Stefano Sabatini
99a30ad56d doc/platform: replace link to site arrozcru.org with link to ffmpeg.zeranoe.com 
ffmpeg.arrozcru.org is currently unmaintained, and it redirects to
ffmpeg.zeranoe.com.
 2012-11-20 14:59:39 +01:00
Martin Storsjö
c19e9d00a7 doc: Point to the new location of the c99-to-c89 tool 
This location contains prebuilt binaries as well.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-11-01 22:47:50 +02:00
Stefano Sabatini
7669144ada doc/platform: Comply With All Capitalized Words Convention 2012-11-01 19:37:41 +01:00
Carl Eugen Hoyos
7139f0e6be Fix typo in platform documentation. 2012-11-01 01:45:53 +01:00
Michael Niedermayer
f3b8096bc0 Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 
* commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff':
  mp3: exit on parsing error in mp_decode_frame
  rtmppkt: Avoid unescaped backslash in Doxygen comment
  fate-lavfi: replace sed/grep/cut combos with awk
  build: Plan 9 support

Conflicts:
	configure
	tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-24 13:42:58 +02:00
Mans Rullgard
4ebc6a7410 build: Plan 9 support 
This adds support for building on Plan 9 x86-32.  The compat/plan9
directory contains these items:

- replacements for the 'head' and 'printf' shell commands
- wrapper for main() to disable FPU exceptions

Larger required changes to the system are described in the
documentation.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-23 12:01:18 +01:00
Derek Buitenhuis
eed7406416 doc/platform: Add info on shared builds with MSVC 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-10-20 13:00:12 -04:00
Derek Buitenhuis
11a73745d5 doc/platform: Move a caveat down to the notes section 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-10-20 12:59:20 -04:00
Derek Buitenhuis
2d09b36c03 doc/platform: Add info on shared builds with MSVC 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-10-20 12:55:59 -04:00
Derek Buitenhuis
f2a7236d0c doc/platform: Move a caveat down to the notes section 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-10-20 12:55:59 -04:00
Derek Buitenhuis
bad603c66a doc/platform: Rework the Visual Studio linking section 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-09-28 16:35:49 -04:00
Derek Buitenhuis
f8241055c7 doc/platform: Replace Visual Studio section with build instructions 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-09-28 16:33:22 -04:00
Derek Buitenhuis
7147efa9f5 doc/platform: Nuke section on linking static MinGW-built libs with MSVC 
This practice is not supported by the MinGW developers, and even requires
patching the MinGW runtimes in newer versions. Furthermore, we now support
build with MSVC, so this section is rendered useless.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-09-28 16:31:07 -04:00
Derek Buitenhuis
d41906f65d doc/platform: Remove false claim about MinGW installer 
This works just fine, and has for quite a while, using the mingw-get
installer.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-09-28 16:31:06 -04:00
Derek Buitenhuis
583661ee0d doc/platform: Mention MinGW-w64 
This is the toolchain most use to build.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-09-28 16:30:53 -04:00
Derek Buitenhuis
7d1d446990 doc/platform: Rework the Visual Studio linking section 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-09-28 15:52:21 -04:00
Derek Buitenhuis
f45b54437a doc/platform: Replace Visual Studio section with build instructions 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-09-28 15:50:32 -04:00
Derek Buitenhuis
3e071551af doc/platform: Nuke section on linking static MinGW-built libs with MSVC 
This practice is not supported by the MinGW developers, and even requires
patching the MinGW runtimes in newer versions. Furthermore, we now support
build with MSVC, so this section is rendered useless.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-09-28 15:27:59 -04:00