mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
184fc600e1
* qatar/master: mpegvideo_enc: only allocate output packet when we know there will be output Add names for more channel layouts to the channel layout map. sunrast: Add a sample request for RMP_RAW colormap. avcodec: do not override pts or duration from the audio encoder Add prores regression test. Enable already existing rso regression test. Add regression test for "sox" format muxer/demuxer. Add dpx encoding regression test. swscale: K&R formatting cosmetics for PowerPC code (part I/II) img2: Use ff_guess_image2_codec(filename) shorthand where appropriate. Clarify licensing information about files borrowed from libjpeg. Mark mutable static data const where appropriate. avplay: fix -threads option dvbsubdec: avoid undefined signed left shift in RGBA macro mlpdec: use av_log_ask_for_sample() gif: K&R formatting cosmetics png: make .long_name more descriptive movdec: Adjust keyframe flagging in fragmented files rv34: change most "int stride" into "ptrdiff_t stride". Conflicts: avprobe.c ffplay.c libavcodec/mlpdec.c libavcodec/mpegvideo_enc.c libavcodec/pngenc.c libavcodec/x86/v210-init.c libavfilter/vf_boxblur.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_setpts.c libavfilter/vf_settb.c libavformat/img2.c libavutil/audioconvert.c tests/codec-regression.sh tests/lavf-regression.sh tests/ref/lavf/dpx tests/ref/vsynth1/prores tests/ref/vsynth2/prores Merged-by: Michael Niedermayer <michaelni@gmx.at>
51 lines
2.2 KiB
Plaintext
51 lines
2.2 KiB
Plaintext
FFmpeg:
|
|
-------
|
|
|
|
Most files in FFmpeg 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.
|
|
|
|
Some optional parts of FFmpeg 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+.
|
|
|
|
Specifically, the GPL parts of FFmpeg are
|
|
|
|
- libpostproc
|
|
- optional x86 optimizations in the files
|
|
libavcodec/x86/idct_mmx.c
|
|
- the X11 grabber in libavdevice/x11grab.c
|
|
|
|
There are a handful of files under other licensing terms, namely:
|
|
|
|
* The files libavcodec/jfdctfst.c, libavcodec/jfdctint_template.c and
|
|
libavcodec/jrevdct.c are taken from libjpeg, see the top of the files for
|
|
licensing details. Specifically note that you must credit the IJG in the
|
|
documentation accompanying your program if you only distribute executables.
|
|
You must also indicate any changes including additions and deletions to
|
|
those three files in the documentation.
|
|
|
|
Should you, for whatever reason, prefer to use version 3 of the (L)GPL, then
|
|
the configure parameter --enable-version3 will activate this licensing option
|
|
for you. Read the file COPYING.LGPLv3 or, if you have enabled GPL parts,
|
|
COPYING.GPLv3 to learn the exact legal terms that apply in this case.
|
|
|
|
|
|
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
|
|
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
|
|
version needs to be upgraded by passing --enable-version3 to configure.
|
|
|
|
The nonfree external libraries libfaac and libaacplus can be hooked up in FFmpeg.
|
|
You need to pass --enable-nonfree to configure to enable it. Employ this option
|
|
with care as FFmpeg then becomes nonfree and unredistributable.
|