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.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18876 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/LICENSE b/LICENSE
index 7c0a3e71b685caa094f711b5409ba0e565add5ce..929f65bebc6c7ba8b364d4f5cd582da2cffba2f8 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -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

diff --git a/configure b/configure
index 4a2234f479a9a07505252b86c79bf0d8d3a74c75..2094f0704b669ff92dad49d564a1a049f2baedae 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 05dfd0db93d927d66b5980c48e4ee251e4746703..cd40666c2cc1d3cb385d3d245651150d2c3927b7 100644 (file)
--- 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
  */