Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

partially rename FFmpeg to Libav

Browse Source 
update mailing list references and irc channels in configure
oldabi
Janne Grunau 14 years ago committed by Janne Grunau
parent fed5676ffe
commit 070c5d0f35
6 changed files with 29 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      CREDITS
  2. 2
      Doxyfile
  3. 6
      INSTALL
  4. 20
      LICENSE
  5. 2
      README
  6. 26
      configure

2
CREDITS
Unescape View File

@ -1,5 +1,5 @@
This file contains the names of some of the people who have contributed to This file contains the names of some of the people who have contributed to
FFmpeg. The names are sorted alphabetically by last name. As this file is Libav/FFmpeg. The names are sorted alphabetically by last name. As this file is
currently quite outdated and git serves as a much better tool for determining currently quite outdated and git serves as a much better tool for determining
authorship, it remains here for historical reasons only. authorship, it remains here for historical reasons only.

2
Doxyfile
Unescape View File

@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project. # by quotes) that should identify the project.
PROJECT_NAME = FFmpeg PROJECT_NAME = Libav
# The PROJECT_NUMBER tag can be used to enter a project or revision number. # The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or

6
INSTALL
Unescape View File

@ -2,10 +2,10 @@
1) Type './configure' to create the configuration. A list of configure 1) Type './configure' to create the configuration. A list of configure
options is printed by running 'configure --help'. options is printed by running 'configure --help'.
'configure' can be launched from a directory different from the FFmpeg 'configure' can be launched from a directory different from the Libav
sources to build the objects out of tree. To do this, use an absolute sources to build the objects out of tree. To do this, use an absolute
path when launching 'configure', e.g. '/ffmpegdir/ffmpeg/configure'. path when launching 'configure', e.g. '/libavdir/libav/configure'.
2) Then type 'make' to build FFmpeg. GNU Make 3.81 or later is required. 2) Then type 'make' to build Libav. GNU Make 3.81 or later is required.
3) Type 'make install' to install all binaries and libraries you built. 3) Type 'make install' to install all binaries and libraries you built.

20
LICENSE
Unescape View File

@ -1,17 +1,17 @@
FFmpeg: Libav:
------- -------
Most files in FFmpeg are under the GNU Lesser General Public License version 2.1 Most files in Libav are under the GNU Lesser General Public License version 2.1
or later (LGPL v2.1+). Read the file COPYING.LGPLv2.1 for details. Some other or later (LGPL v2.1+). Read the file COPYING.LGPLv2.1 for details. Some other
files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to
FFmpeg. Libav.
Some optional parts of FFmpeg are licensed under the GNU General Public License Some optional parts of Libav are licensed under the GNU General Public License
version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of
these parts are used by default, you have to explicitly pass --enable-gpl to these parts are used by default, you have to explicitly pass --enable-gpl to
configure to activate them. In this case, FFmpeg's license changes to GPL v2+. configure to activate them. In this case, Libav's license changes to GPL v2+.
Specifically, the GPL parts of FFmpeg are Specifically, the GPL parts of Libav are
- libpostproc - libpostproc
- optional x86 optimizations in the files - optional x86 optimizations in the files
@ -33,14 +33,14 @@ external libraries:
------------------- -------------------
Some external libraries, e.g. libx264, are under GPL and can be used in Some external libraries, e.g. libx264, are under GPL and can be used in
conjunction with FFmpeg. They require --enable-gpl to be passed to configure conjunction with Libav. They require --enable-gpl to be passed to configure
as well. as well.
The OpenCORE external libraries are under the Apache License 2.0. That license The OpenCORE external libraries are under the Apache License 2.0. That license
is incompatible with the LGPL v2.1 and the GPL v2, but not with version 3 of is incompatible with the LGPL v2.1 and the GPL v2, but not with version 3 of
those licenses. So to combine the OpenCORE libraries with FFmpeg, the license those licenses. So to combine the OpenCORE libraries with Libav, the license
version needs to be upgraded by passing --enable-version3 to configure. version needs to be upgraded by passing --enable-version3 to configure.
The nonfree external library libfaac can be hooked up in FFmpeg. You need to The nonfree external library libfaac can be hooked up in Libav. You need to
pass --enable-nonfree to configure to enable it. Employ this option with care pass --enable-nonfree to configure to enable it. Employ this option with care
as FFmpeg then becomes nonfree and unredistributable. as Libav then becomes nonfree and unredistributable.

2
README
Unescape View File

@ -1,4 +1,4 @@
FFmpeg README Libav README
------------- -------------
1) Documentation 1) Documentation

26
configure vendored
Unescape View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# FFmpeg configure script # Libav configure script
# #
# Copyright (c) 2000-2002 Fabrice Bellard # Copyright (c) 2000-2002 Fabrice Bellard
# Copyright (c) 2005-2008 Diego Biurrun # Copyright (c) 2005-2008 Diego Biurrun
@ -44,9 +44,9 @@ if test "$E1" != 0 || test "$E2" = 0; then
echo "No compatible shell script interpreter found." echo "No compatible shell script interpreter found."
echo "This configure script requires a POSIX-compatible shell" echo "This configure script requires a POSIX-compatible shell"
echo "such as bash or ksh." echo "such as bash or ksh."
echo "THIS IS NOT A BUG IN FFMPEG, DO NOT REPORT IT AS SUCH." echo "THIS IS NOT A BUG IN LIBAV, DO NOT REPORT IT AS SUCH."
echo "Instead, install a working POSIX-compatible shell." echo "Instead, install a working POSIX-compatible shell."
echo "Disabling this configure test will create a broken FFmpeg." echo "Disabling this configure test will create a broken Libav."
if test "$BASH_VERSION" = '2.04.0(1)-release'; then if test "$BASH_VERSION" = '2.04.0(1)-release'; then
echo "This bash version ($BASH_VERSION) is broken on your platform." echo "This bash version ($BASH_VERSION) is broken on your platform."
echo "Upgrade to a later version if available." echo "Upgrade to a later version if available."
@ -237,7 +237,7 @@ Advanced options (experts only):
--enable-sram allow use of on-chip SRAM --enable-sram allow use of on-chip SRAM
--disable-symver disable symbol versioning --disable-symver disable symbol versioning
Developer options (useful when working on FFmpeg itself): Developer options (useful when working on Libav itself):
--disable-debug disable debugging symbols --disable-debug disable debugging symbols
--enable-debug=LEVEL set the debug level [$debuglevel] --enable-debug=LEVEL set the debug level [$debuglevel]
--disable-optimizations disable compiler optimizations --disable-optimizations disable compiler optimizations
@ -279,7 +279,7 @@ die(){
If you think configure made a mistake, make sure you are using the latest If you think configure made a mistake, make sure you are using the latest
version from Git. If the latest version fails, report the problem to the version from Git. If the latest version fails, report the problem to the
ffmpeg-user@mplayerhq.hu mailing list or IRC #ffmpeg on irc.freenode.net. libav-user@libav.org mailing list or IRC #libav on irc.freenode.net.
EOF EOF
if disabled logging; then if disabled logging; then
cat <<EOF cat <<EOF
@ -2361,7 +2361,7 @@ case $target_os in
openbsd) openbsd)
enable malloc_aligned enable malloc_aligned
# On OpenBSD 4.5. the compiler does not use PIC unless # On OpenBSD 4.5. the compiler does not use PIC unless
# explicitly using -fPIC. FFmpeg builds fine without PIC, # explicitly using -fPIC. Libav builds fine without PIC,
# however the generated executable will not do anything # however the generated executable will not do anything
# (simply quits with exit-code 1, no crash, no output). # (simply quits with exit-code 1, no crash, no output).
# Thus explicitly enable PIC here. # Thus explicitly enable PIC here.
@ -3414,10 +3414,10 @@ Cflags: -I\${includedir}
EOF EOF
} }
pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" pkgconfig_generate libavutil "Libav utility library" "$LIBAVUTIL_VERSION"
pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" pkgconfig_generate libavcodec "Libav codec library" "$LIBAVCODEC_VERSION" "$extralibs"
pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION" pkgconfig_generate libavformat "Libav container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"
pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION" pkgconfig_generate libavdevice "Libav device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION"
pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" pkgconfig_generate libavfilter "Libav video filtering library" "$LIBAVFILTER_VERSION" "$extralibs"
pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" pkgconfig_generate libpostproc "Libav post processing library" "$LIBPOSTPROC_VERSION"
pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" pkgconfig_generate libswscale "Libav image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"

Write Preview
Loading…
Cancel
Save