1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Commit Graph

40 Commits

Author SHA1 Message Date
Michael Niedermayer
085bd039bb Merge commit 'e2c272eb3660d7f4f1d7720980e30f6a617e7eb3'
* commit 'e2c272eb3660d7f4f1d7720980e30f6a617e7eb3':
  LICENSE: Move (L)GPLv3 explanation block to a more suitable place
  swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-28 12:49:25 +01:00
Diego Biurrun
e2c272eb36 LICENSE: Move (L)GPLv3 explanation block to a more suitable place 2013-02-27 19:51:10 +01:00
Paul B Mahol
af882e1819 lavfi: port MP noise filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-16 11:42:41 +00:00
Stefano Sabatini
0140566359 lavfi: add histeq filter
This is a port of virtual dub's histogram equalization filter by Donald
A. Graft. Based on the work by Jérémy Tran <tran.jeremy.av@gmail.com>,
done for SOCIS 2012.
2013-01-05 10:25:32 +01:00
Stefano Sabatini
172505b8bc lavfi: add kerndeint filter
This is a port of the kerndeint filter (libmpcodecs/vf_kerndeint) by
Donal A. Graft (original avisynth plugin author), and is based on the
work by Jérémy Tran <tran.jeremy.av@gmail.com> done for SOCIS 2012.
2013-01-05 10:25:32 +01:00
Clément Bœsch
9b8de93036 lavfi: add pp filter.
Ported from MPlayer. Original author is A'rpi, with various
contributions from Michael Niedermayer. The original documentation was
mostly written by Diego Biurrun. See the MPlayer history for full
credits.

The filter is under GPL like the original filter, even if it differs
quite a lot. There is not much point in making it LGPL since pp is under
GPL.
2012-12-23 19:03:36 +01:00
Clément Bœsch
8eecbaf5e4 lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
Clément Bœsch
fd6707ed0e lavfi/hue: add missing GPL dependency. 2012-10-31 19:28:02 +01:00
Clément Bœsch
5b4cae50c9 LICENSE: update GPL filter list. 2012-10-31 19:28:02 +01:00
Michael Niedermayer
484aec4da3 LICENSE: correct incorrect claims on *GPL incompatibility
There are currently no statements from any person qualified in the art
of law about the LGPL compatibility of the libfaac license and others.
Furthermore their is no consensus about their compatibility amongth
people not qualified in the art.

Also of interrest may be that ubuntu distributes and links libfaac
to LGPL code. And the ubuntu technical comittee decision about libfaac
https://lists.ubuntu.com/archives/technical-board/2011-February/000703.html

Comments and other viewpoints, especially if i have missed something
are very welcome!

Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-16 04:47:18 +02:00
Michael Niedermayer
d8c3170c9f Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  g723.1: do not pass large structs by value
  g723.1: do not bounce intermediate values via memory
  g723.1: declare a variable in the block it is used
  g723.1: avoid saving/restoring excitation
  g723.1: avoid unnecessary memcpy() in residual_interp()
  g723.1: make postfilter write directly to output buffer
  g723.1: drop unnecessary variable buf_ptr in formant_postfilter()
  g723.1: make scale_vector() output to a separate buffer
  g723.1: make autocorr_max() work on an arbitrary buffer
  g723.1: do not needlessly use int64_t
  g723.1: use saturating addition functions
  g723.1: optimise scale_vector()
  g723.1: remove useless uses of MUL64()
  g723.1: remove unnecessary argument 'shift' from dot_product()
  g723.1: deobfuscate "(x << 4) - x" to "15 * x"
  celp: optimise ff_celp_lp_synthesis_filter()
  libavutil: add saturating addition functions
  cllc: Implement ARGB support
  cllc: Add support for QRGB
  cllc: Rename some funcs to represent what they actually do
  ...

Conflicts:
	LICENSE
	libavcodec/g723_1.c
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-13 14:38:43 +02:00
Diego Biurrun
f30ff54200 doc: Clarify licensing issues arising from external libraries 2012-08-12 13:28:58 +02:00
Derek Buitenhuis
878b3f2a24 LICENSE: Document all GPL files
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-04 04:03:08 +02:00
Michael Niedermayer
a7acab6cda Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vc1dec: Remove separate scaling function for interlaced field MVs
  vc1dec: Invoke edge_emulation regardless of MV precision
  x86: Use consistent 3dnowext function and macro name suffixes
  g723_1: scale output as supposed for the case with postfilter disabled
  g723_1: increase excitation storage by 4
  g723_1: fix upper bound parameter from inverse maximum autocorrelation
  g723_1: make scale_vector() behave like the reference
  g723_1: fix off-by-one error in normalize_bits()
  g723_1: save/restore excitation with offset to store LPC history
  wmapro: prevent division by zero when sample rate is unspecified
  x86: proresdsp: improve SIGNEXTEND macro comments
  x86: h264dsp: K&R formatting cosmetics
  LICENSE: Document all GPL files

Conflicts:
	libavcodec/g723_1.c
	libavcodec/wmaprodec.c
	libavcodec/x86/h264dsp_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-03 23:13:06 +02:00
Derek Buitenhuis
144e4b0997 LICENSE: Document all GPL files
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2012-08-02 14:09:51 -04:00
Mans Rullgard
ec7c501ed5 x86: remove libmpeg2 mmx(ext) idct functions
These functions are not faster than other mmx implementations on
any hardware I have been able to test on, and they are horribly
inaccurate.  There is thus no reason to ever use them.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-08-02 12:14:52 +01:00
Diego Biurrun
b315042c8c Remove libpostproc.
This library does not fit into Libav as a whole and its code is just a
maintenance burden.  Furthermore it is now available as an external project,
which completely obviates any reason to keep it around.

URL: http://git.videolan.org/?p=libpostproc.git
2012-02-23 19:36:16 +01:00
Michael Niedermayer
184fc600e1 Merge remote-tracking branch 'qatar/master'
* 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>
2012-02-22 02:24:18 +01:00
Diego Biurrun
24d150b773 Clarify licensing information about files borrowed from libjpeg. 2012-02-21 20:17:56 +01:00
tipok
cbf914cf16 libaac+ support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-26 02:28:21 +02:00
Janne Grunau
364cbc346b cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
Michael Niedermayer
c0b1bc8d17 Revert "partially rename FFmpeg to Libav"
This reverts commit 070c5d0f35.
2011-03-17 17:26:45 +01:00
Janne Grunau
070c5d0f35 partially rename FFmpeg to Libav
update mailing list references and irc channels in configure
2011-03-16 21:54:39 +01:00
Ronald S. Bultje
240fd8ef06 Remove h264 asm items off the GPL-only list. They are LGPL now.
Originally committed as revision 25093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-10 03:31:24 +00:00
Diego Biurrun
788c82e308 libvpx now has an (L)GPL-compatible license.
Originally committed as revision 23482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-05 08:01:47 +00:00
Diego Biurrun
879c9d1a63 Add a short note about libvpx.
Originally committed as revision 23394 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-31 21:41:53 +00:00
Diego Biurrun
eb55f3da3d The GPL-licensed optimizations in libswscale have been replaced.
Originally committed as revision 23387 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-30 08:31:50 +00:00
Diego Biurrun
c271ad21ac Clarify which parts of libswscale remain GPL.
Originally committed as revision 22697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-27 11:31:30 +00:00
Diego Biurrun
fc1206a4d9 Remove support for nonfree libamr library for AMR-NB/WB decoding/encoding.
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
2009-07-07 00:28:16 +00:00
Diego Biurrun
d03936e5aa libfaac no longer claims to be LGPL.
Originally committed as revision 19353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 05:22:50 +00:00
Diego Biurrun
0b175caac8 Add support for external OpenCORE libraries for AMR-NB/WB support.
Originally committed as revision 19117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 12:32:40 +00:00
Diego Biurrun
9cad0e4ed8 Add configure option to upgrade (L)GPL to version 3.
Originally committed as revision 19116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 11:04:03 +00:00
Diego Biurrun
4656c375bc Move around one paragraph, add headings for greater clarity.
Originally committed as revision 19115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 10:58:48 +00:00
Diego Biurrun
ecc1330a6d Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.
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
2009-06-05 09:51:31 +00:00
Diego Biurrun
1754fe4d30 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
2009-05-19 22:58:09 +00:00
Diego Biurrun
c7279693ae Add note about nonfree license of libfaac.
Originally committed as revision 18735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-04 11:37:25 +00:00
Dylan Yudaken
3ba153f8da Replace MPEG group reference DCT implementation by newly rewritten version.
patch by Dylan Yudaken, dyudaken gmail com

Originally committed as revision 18274 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 15:50:11 +00:00
Diego Biurrun
b2184b9c56 AltiVec optimizations in libswscale are no longer GPL.
Originally committed as revision 18215 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-29 13:48:43 +00:00
Diego Biurrun
1f30649633 typo: beomes --> becomes
Originally committed as revision 18186 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-25 14:19:22 +00:00
Diego Biurrun
aae9c405c7 Move licensing information into a separate file called LICENSE and
rewrite it for greater clarity in the process.

Originally committed as revision 18185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-25 14:05:20 +00:00