diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-28 21:57:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-29 02:27:13 +0200 |
| commit | 34c27ada10f085ddb0b9bbe12217f22886683ee1 (patch) | |
| tree | ef244c33d3dc9870d975ed557f6526409cb15889 | |
| parent | c50998675d0c1a932dcf2b79a150a4dfe430050c (diff) | |
| download | ffmpeg-34c27ada10f085ddb0b9bbe12217f22886683ee1.tar.gz | |
Revert some silly renamings that leaked in from a pull.
| -rw-r--r-- | doc/build_system.txt | 2 | ||||
| -rw-r--r-- | libavcodec/arm/ac3dsp_init_arm.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/build_system.txt b/doc/build_system.txt index 8e6c63ab68..36c141e9e4 100644 --- a/doc/build_system.txt +++ b/doc/build_system.txt @@ -9,7 +9,7 @@ V DESTDIR Destination directory for the install targets, useful to prepare packages - or install Libav in cross-environments. + or install FFmpeg in cross-environments. Makefile targets: diff --git a/libavcodec/arm/ac3dsp_init_arm.c b/libavcodec/arm/ac3dsp_init_arm.c index 6874546c7c..ad6446435d 100644 --- a/libavcodec/arm/ac3dsp_init_arm.c +++ b/libavcodec/arm/ac3dsp_init_arm.c @@ -1,20 +1,20 @@ /* * Copyright (c) 2011 Mans Rullgard <mans@mansr.com> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ |