diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-05-19 22:58:09 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-05-19 22:58:09 +0000 |
| commit | 1754fe4d3070d2f5fbc9b0ebc3168b3c328ba864 (patch) | |
| tree | 39d5b86a533bd950c70c4a01bc87182e717a2ab3 | |
| parent | d869a460dbdc6efbafbf74d1a2ef14eae367179e (diff) | |
| download | ffmpeg-streaming-1754fe4d3070d2f5fbc9b0ebc3168b3c328ba864.zip ffmpeg-streaming-1754fe4d3070d2f5fbc9b0ebc3168b3c328ba864.tar.gz | |
The AC-3 decoder is now LGPL. Exchange the license header and change references
in the build system and documentation that mark it as GPL.
Originally committed as revision 18876 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | LICENSE | 1 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/ac3dec.c | 13 |
3 files changed, 4 insertions, 12 deletions
@@ -16,7 +16,6 @@ Specifically, the GPL parts of FFmpeg are libavcodec/x86/h264_deblock_sse2.asm libavcodec/x86/h264_idct_sse2.asm libavcodec/x86/idct_mmx.c -- the AC-3 decoder in libavcodec/ac3dec.c - the X11 grabber in libavdevice/x11grab.c Some external libraries, e.g. libx264, are under GPL and can be used in @@ -1003,7 +1003,6 @@ vis_deps="sparc" # decoders / encoders / hardware accelerators aac_decoder_select="fft mdct" -ac3_decoder_deps="gpl" ac3_decoder_select="fft mdct" atrac3_decoder_select="fft mdct" cavs_decoder_select="golomb" @@ -1012,7 +1011,6 @@ cscd_decoder_suggest="zlib" dca_decoder_select="fft mdct" dnxhd_encoder_select="aandct" dxa_decoder_select="zlib" -eac3_decoder_deps="gpl" eac3_decoder_select="fft mdct" eatgq_decoder_select="aandct" eatqi_decoder_select="aandct" diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 05dfd0d..cd40666 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -7,24 +7,19 @@ * Copyright (c) 2007-2008 Bartlomiej Wolowiec <bartek.wolowiec@gmail.com> * Copyright (c) 2007 Justin Ruggles <justin.ruggles@gmail.com> * - * Portions of this code are derived from liba52 - * http://liba52.sourceforge.net - * Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org> - * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> - * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * 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 - * General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public + * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ |
