From ba1927dda9a96476f3b0f56278349a596a1f8558 Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Fri, 18 Mar 2011 18:10:32 +0100 Subject: [PATCH] partially rename FFmpeg to Libav update mailing list references and irc channels in configure (cherry picked from commit 070c5d0f3530c16c92b81f3f0de2943410367c00) --- CREDITS | 6 ++++-- Doxyfile | 2 +- INSTALL | 6 +++--- LICENSE | 20 ++++++++++---------- README | 2 +- cmdutils.c | 2 +- configure | 28 ++++++++++++++-------------- 7 files changed, 34 insertions(+), 32 deletions(-) diff --git a/CREDITS b/CREDITS index 404cf38d44..4a537786f0 100644 --- a/CREDITS +++ b/CREDITS @@ -1,5 +1,7 @@ -This file contains the name of the people who have contributed to -FFmpeg. The names are sorted alphabetically by last name. +This file contains the names of some of the people who have contributed to +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 +authorship, it remains here for historical reasons only. Dénes Balatoni Michel Bardiaux diff --git a/Doxyfile b/Doxyfile index ee233b9d00..5e1a4055a3 100644 --- a/Doxyfile +++ b/Doxyfile @@ -17,7 +17,7 @@ # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # 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. # This could be handy for archiving the generated documentation or diff --git a/INSTALL b/INSTALL index 8cd22bd441..2ed04ef2b9 100644 --- a/INSTALL +++ b/INSTALL @@ -2,10 +2,10 @@ 1) Type './configure' to create the configuration. A list of configure 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 -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. diff --git a/LICENSE b/LICENSE index 668350b185..c6bcbe8efb 100644 --- a/LICENSE +++ b/LICENSE @@ -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 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 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 - optional MMX optimizations for YUV to RGB colorspace conversion in @@ -37,14 +37,14 @@ external libraries: ------------------- 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. 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 -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. -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 -as FFmpeg then becomes nonfree and unredistributable. +as Libav then becomes nonfree and unredistributable. diff --git a/README b/README index e907e90223..6346cff926 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -FFmpeg README +Libav README ------------- 1) Documentation diff --git a/cmdutils.c b/cmdutils.c index 2349b7052e..23f0efeed6 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -341,7 +341,7 @@ static void maybe_print_config(const char *lib, const char *cfg) void show_banner(void) { - fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d the FFmpeg developers\n", + fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d the Libav developers\n", program_name, program_birth_year, this_year); fprintf(stderr, " built on %s %s with %s %s\n", __DATE__, __TIME__, CC_TYPE, CC_VERSION); diff --git a/configure b/configure index 0166829f77..3f5176ea39 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #!/bin/sh # -# FFmpeg configure script +# Libav configure script # # Copyright (c) 2000-2002 Fabrice Bellard # 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 "This configure script requires a POSIX-compatible shell" 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 "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 echo "This bash version ($BASH_VERSION) is broken on your platform." echo "Upgrade to a later version if available." @@ -239,7 +239,7 @@ Advanced options (experts only): --malloc-prefix=PFX prefix malloc and related names with PFX --enable-sram allow use of on-chip SRAM -Developer options (useful when working on FFmpeg itself): +Developer options (useful when working on Libav itself): --disable-debug disable debugging symbols --enable-debug=LEVEL set the debug level [$debuglevel] --enable-gprof enable profiling with gprof [$gprof] @@ -275,8 +275,8 @@ die(){ cat <