summaryrefslogtreecommitdiffstats
path: root/LICENSE
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-221-2/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Clarify licensing information about files borrowed from libjpeg.Diego Biurrun2012-02-211-2/+6
| |
| * cosmetics: fix dashed line length after 070c5d0Janne Grunau2011-03-281-1/+1
| |
* | libaac+ supporttipok2011-09-261-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "partially rename FFmpeg to Libav"Michael Niedermayer2011-03-171-10/+10
|/ | | | This reverts commit 070c5d0f3530c16c92b81f3f0de2943410367c00.
* partially rename FFmpeg to LibavJanne Grunau2011-03-161-10/+10
| | | | update mailing list references and irc channels in configure
* Remove h264 asm items off the GPL-only list. They are LGPL now.Ronald S. Bultje2010-09-101-2/+0
| | | | Originally committed as revision 25093 to svn://svn.ffmpeg.org/ffmpeg/trunk
* libvpx now has an (L)GPL-compatible license.Diego Biurrun2010-06-051-4/+0
| | | | Originally committed as revision 23482 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a short note about libvpx.Diego Biurrun2010-05-311-0/+4
| | | | Originally committed as revision 23394 to svn://svn.ffmpeg.org/ffmpeg/trunk
* The GPL-licensed optimizations in libswscale have been replaced.Diego Biurrun2010-05-301-2/+0
| | | | Originally committed as revision 23387 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Clarify which parts of libswscale remain GPL.Diego Biurrun2010-03-271-1/+2
| | | | Originally committed as revision 22697 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove support for nonfree libamr library for AMR-NB/WB decoding/encoding.Diego Biurrun2009-07-071-3/+3
| | | | | | libopencore can now be used as a replacement except for AMR-WB encoding. Originally committed as revision 19365 to svn://svn.ffmpeg.org/ffmpeg/trunk
* libfaac no longer claims to be LGPL.Diego Biurrun2009-07-061-1/+0
| | | | Originally committed as revision 19353 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add support for external OpenCORE libraries for AMR-NB/WB support.Diego Biurrun2009-06-051-0/+5
| | | | Originally committed as revision 19117 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add configure option to upgrade (L)GPL to version 3.Diego Biurrun2009-06-051-0/+5
| | | | Originally committed as revision 19116 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move around one paragraph, add headings for greater clarity.Diego Biurrun2009-06-051-5/+12
| | | | Originally committed as revision 19115 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.Diego Biurrun2009-06-051-3/+3
| | | | | | | This is in preparation for the (L)GPL license upgrade code that will add version 3 of these licenses. Originally committed as revision 19114 to svn://svn.ffmpeg.org/ffmpeg/trunk
* The AC-3 decoder is now LGPL. Exchange the license header and change referencesDiego Biurrun2009-05-191-1/+0
| | | | | | in the build system and documentation that mark it as GPL. Originally committed as revision 18876 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add note about nonfree license of libfaac.Diego Biurrun2009-05-041-3/+4
| | | | Originally committed as revision 18735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace MPEG group reference DCT implementation by newly rewritten version.Dylan Yudaken2009-03-311-4/+0
| | | | | | patch by Dylan Yudaken, dyudaken gmail com Originally committed as revision 18274 to svn://svn.ffmpeg.org/ffmpeg/trunk
* AltiVec optimizations in libswscale are no longer GPL.Diego Biurrun2009-03-291-1/+1
| | | | Originally committed as revision 18215 to svn://svn.ffmpeg.org/ffmpeg/trunk
* typo: beomes --> becomesDiego Biurrun2009-03-251-1/+1
| | | | Originally committed as revision 18186 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move licensing information into a separate file called LICENSE andDiego Biurrun2009-03-251-0/+37
rewrite it for greater clarity in the process. Originally committed as revision 18185 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud