Commit 1754fe4d authored by Diego Biurrun's avatar Diego Biurrun

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
parent d869a460
...@@ -16,7 +16,6 @@ Specifically, the GPL parts of FFmpeg are ...@@ -16,7 +16,6 @@ Specifically, the GPL parts of FFmpeg are
libavcodec/x86/h264_deblock_sse2.asm libavcodec/x86/h264_deblock_sse2.asm
libavcodec/x86/h264_idct_sse2.asm libavcodec/x86/h264_idct_sse2.asm
libavcodec/x86/idct_mmx.c libavcodec/x86/idct_mmx.c
- the AC-3 decoder in libavcodec/ac3dec.c
- the X11 grabber in libavdevice/x11grab.c - the X11 grabber in libavdevice/x11grab.c
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
......
...@@ -1003,7 +1003,6 @@ vis_deps="sparc" ...@@ -1003,7 +1003,6 @@ vis_deps="sparc"
# decoders / encoders / hardware accelerators # decoders / encoders / hardware accelerators
aac_decoder_select="fft mdct" aac_decoder_select="fft mdct"
ac3_decoder_deps="gpl"
ac3_decoder_select="fft mdct" ac3_decoder_select="fft mdct"
atrac3_decoder_select="fft mdct" atrac3_decoder_select="fft mdct"
cavs_decoder_select="golomb" cavs_decoder_select="golomb"
...@@ -1012,7 +1011,6 @@ cscd_decoder_suggest="zlib" ...@@ -1012,7 +1011,6 @@ cscd_decoder_suggest="zlib"
dca_decoder_select="fft mdct" dca_decoder_select="fft mdct"
dnxhd_encoder_select="aandct" dnxhd_encoder_select="aandct"
dxa_decoder_select="zlib" dxa_decoder_select="zlib"
eac3_decoder_deps="gpl"
eac3_decoder_select="fft mdct" eac3_decoder_select="fft mdct"
eatgq_decoder_select="aandct" eatgq_decoder_select="aandct"
eatqi_decoder_select="aandct" eatqi_decoder_select="aandct"
......
...@@ -7,24 +7,19 @@ ...@@ -7,24 +7,19 @@
* Copyright (c) 2007-2008 Bartlomiej Wolowiec <bartek.wolowiec@gmail.com> * Copyright (c) 2007-2008 Bartlomiej Wolowiec <bartek.wolowiec@gmail.com>
* Copyright (c) 2007 Justin Ruggles <justin.ruggles@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. * This file is part of FFmpeg.
* *
* FFmpeg 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 General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * 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, * FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * 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 * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment