generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
31,780 Commits 24 Branches 241 Tags
b3e5c8de6a46dd5acb510147df22818d8a971607
Commit Graph

92 Commits

Author SHA1 Message Date
Michael Niedermayer
a3d331f2d8 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 
* qatar/release/0.7: (96 commits)
  intfloat_readwrite: fix signed addition overflows
  smacker: validate channels and sample format.
  smacker: check buffer size before reading output size
  smacker: validate number of channels
  sipr: fix get_bits(0) calls
  motion_est: make MotionExtContext.map_generation unsigned
  4xm: prevent NULL dereference with invalid huffman table
  4xmdemux: prevent use of uninitialized memory
  4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers
  ptx: check for out of bound reads
  tiffdec: fix out of bound reads/writes
  eacmv: check for out of bound reads
  eacmv: fix potential pointer arithmetic overflows
  adpcm: fix out of bound reads due to integer overflow
  anm: prevent infinite loop
  avsdemux: check for out of bound writes
  avs: check for out of bound reads
  avsdemux: check for corrupted data
  mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.
  vaapi: Fix VC-1 decoding (reconstruct bitstream TTFRM correctly).
  ...

Conflicts:
	libavcodec/adpcm.c
	libavcodec/bink.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/motion_est_template.c
	libavcodec/mpegvideo.c
	libavcodec/nellymoserdec.c
	libavcodec/ptx.c
	libavcodec/svq3.c
	libavcodec/vaapi_vc1.c
	libavcodec/xan.c
	libavfilter/vf_scale.c
	libavformat/4xm.c
	libavformat/flvdec.c
	libavformat/mpeg.c
	tests/ref/fate/motionpixels

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-19 05:14:44 +01:00
Stefano Sabatini
5c9ca599a7 vf_yadif: correct documentation on the parity parameter 
0 is top-field-first, 1 is bottom-field-first, not the other way
around.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 4703a7b50b)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2012-02-08 14:38:27 +01:00
Stefano Sabatini
8d61c68442 vf_unsharp: set default chroma size value to 5x5 
The previous default value 0x0 was not good, since it is not even
valid.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 1ee2014190)
 2011-10-01 20:51:52 +02:00
Stefano Sabatini
44f669e7bc lavfi: add vsink_buffer, and use it in ff* tools 
Also add the public interface libavfilter/vsink_buffer.h.
 2011-06-19 19:18:33 +02:00
Stefano Sabatini
15f03725ce lavfi: add negate filter 
This filter is a simple wrapper around the LUT filter.
 2011-06-19 19:06:55 +02:00
Stefano Sabatini
dd2793c880 lavfi: add LUT (LookUp Table) generic filters 2011-06-19 19:06:35 +02:00
Stefano Sabatini
b8e3b74147 vf_mp: fix name of the remove-logo filter referenced in filters.texi 
Correct the name from "remove_logo" to "remove-logo".
 2011-05-25 18:29:55 +02:00
Stefano Sabatini
07586b68a8 lavfi: add select filter 
Address trac issue #92.
 2011-05-25 12:54:07 +02:00
Stefano Sabatini
8a5b71d0c3 vf_split: add documentation to filters.texi 2011-05-22 02:43:47 +02:00
Stefano Sabatini
d3fddb8454 vsrc_buffer: fix example in docs, add mandatory parameters 2011-05-19 23:15:34 +02:00
Stefano Sabatini
50764e19a8 vsrc_buffer: make the source accept sws_param in init 
Avoid the need of two distinct av_vsrc_add_video_buffer_ref*
functions. Simplify the interface.
 2011-05-19 23:15:33 +02:00
Stefano Sabatini
a05d02079e showinfo: replace "CRC" by "checksum" 
Indeed the Adler-32 checksum, which is computed by showinfo, is not
cyclic, so using the term "CRC" is wrong/confusing.
 2011-05-15 12:28:53 +02:00
Stefano Sabatini
994de197c0 drawtext: add documentation for the shadow parameters 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-07 10:21:56 +02:00
Stefano Sabatini
a5b64584f3 lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo 
With the following additions:
* support to anti-aliased glyph rendering
* support to UTF-8 text and Unicode chars rendering
* support for RGB packed formats
* fix minor errors and typos in the filter description
* extend/clarify examples in the filter description

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-07 10:17:40 +02:00
Stefano Sabatini
31d8467d82 lavfi: add showinfo filter 2011-04-27 11:12:45 +02:00
Stefano Sabatini
73a4f7c21b pad: make the filter parametric 
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-26 07:43:34 +02:00
Michael Niedermayer
7a11c82fb7 vsrc_buffer: add sample_aspect_ratio fields to arguments. 
This fixes aspect handling in ffmpeg.

This is based on a patch by Baptiste.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-26 07:38:24 +02:00
Mark Himsley
2f84bb4236 lavfi: add fieldorder filter 
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-26 07:37:41 +02:00
Stefano Sabatini
68e23c083a scale: make the filter parametric 
Make the filter accept parametric expressions for the output video
size.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-26 07:29:29 +02:00
Stefano Sabatini
484a330890 pad: make the filter parametric 
Address trac issue #61.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-19 15:28:01 +02:00
Mark Himsley
aa0c515a3c lavfi: add fieldorder filter 
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-11 00:14:21 +02:00
Stefano Sabatini
aeefbf61c0 pad: fix example explanation 
"row" and "column" term positions in the explanation were inverted.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-10 09:27:01 +02:00
Stefano Sabatini
3eccfaa012 gradfun: add notice from the MPlayer manual 
Add notice telling that the filter is designed for playback only.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-10 09:26:02 +02:00
Stefano Sabatini
2fd8756b9f documentation: add setdar and setsar description to filters.texi 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-10 09:22:04 +02:00
Stefano Sabatini
4f29941194 pad: fix example explanation 
"row" and "column" term positions in the explanation were inverted.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-07 17:45:31 +02:00
Stefano Sabatini
d496d33d26 scale: make the filter parametric 
Make the filter accept parametric expressions for the output video
size.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-05 15:38:34 +02:00
Brandon Mintern
aadfc9ee74 lavfi: add fade filter 
Port fade filter from libavfilter soc repo, with minor fixes by
Stefano.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-03 08:47:16 +02:00
Stefano Sabatini
7dd29fb606 drawtext: extend/clarify examples in the filter description 2011-04-02 11:50:48 +02:00
Stefano Sabatini
7e3373d2cf drawtext: fix wrong reference in boxcolor option description 2011-04-02 11:48:19 +02:00
Stefano Sabatini
17be8ef709 drawtext: add documentation for the shadow parameters 2011-04-02 11:48:08 +02:00
Stefano Sabatini
da3534b01e gradfun: add notice from the MPlayer manual 
Add notice telling that the filter is designed for playback only.
 2011-03-30 22:17:41 +02:00
Stefano Sabatini
2ccbb3428b documentation: add setdar and setsar description to filters.texi 2011-03-30 22:17:34 +02:00
Stefano Sabatini
cd39549e2c mp: add filter description to filters.texi 2011-03-30 00:20:08 +02:00
Stefano Sabatini
681ba7229e documentation: sort filter descriptions in filters.texi 
Change position of the fade filter description, put it between
drawtext and fifo descriptions.
 2011-03-28 22:50:09 +02:00
Stefano Sabatini
5c5816c4e3 drawtext: fix minor errors and typos in the filter description 2011-03-27 18:53:39 +02:00
Michael Niedermayer
a6be21d3ba Revert "replace FFmpeg with Libav in doc/" 
This reverts commit f8a45fa1b1.

Conflicts:

	doc/optimization.txt
 2011-03-17 17:26:45 +01:00
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master' 
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 17:22:52 +01:00
Janne Grunau
f8a45fa1b1 replace FFmpeg with Libav in doc/ 
unless it stands for ffmpeg the program or is historic
 2011-03-16 22:01:01 +01:00
Stefano Sabatini
bd8e750300 Port drawtext filter by Hemanth from the libavfilter soc repo, with 
the following additions:
* support to anti-aliased glyph rendering
* support to UTF-8 text and Unicode chars rendering
* support for RGB packed formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-02-22 01:49:45 +01:00
Brandon Mintern
704865fc87 lavfi: add fade filter 
Port fade filter from libavfilter soc repo, with minor fixes by
Stefano.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-02-21 13:56:48 +01:00
Stefano Sabatini
b423996b57 Update overlay documentation after movie syntax update. 
Overlay documentation is still using the old unsupported syntax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aa8ac53b51)
 2011-02-13 00:52:51 +01:00
Stefano Sabatini
aa8ac53b51 Update overlay documentation after movie syntax update. 
Overlay documentation is still using the old unsupported syntax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-11 14:01:04 +00:00
Stefano Sabatini
9b8bb626dc libavfilter: add video movie source 
See thread:
Subject: [PATCH] movie video source
Date: 2010-12-31 15:35:30 GMT

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-02-09 03:33:28 +01:00
Stefano Sabatini
9409c3811c libavfilter: add video movie source 
See thread:
Subject: [PATCH] movie video source
Date: 2010-12-31 15:35:30 GMT

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-02-08 13:20:56 +01:00
Michael Niedermayer
7b3ea5507c Add sample_aspect_ratio fields to vsrc_buffer arguments. 
This fixes aspect handling in ffmpeg
This is based on a patch by baptiste
 2011-01-31 21:32:06 +01:00
Baptiste Coudurier
a51c71bb54 In yadif filter, default to top field first if interlacing is unknown 
Originally committed as revision 26347 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-15 00:32:36 +00:00
Stefano Sabatini
e6dba1d881 Fix typos in the crop filter documentation. 
Originally committed as revision 26284 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 10:28:41 +00:00
Stefano Sabatini
b567020943 Add copy filter, useful for testing the avfilter_draw_slice() copy 
code.

Originally committed as revision 26112 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-28 01:01:09 +00:00
Stefano Sabatini
f150e4dc2c Extend documentation for format and noformat filters, and remove 
explicit reference to the ffmpeg tool command for keeping the docs
more generic.

Originally committed as revision 26098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 11:52:26 +00:00
Stefano Sabatini
17fc94933b Add erode libopencv filter. 
Originally committed as revision 26097 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 11:27:09 +00:00