virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
63,506 Commits 37 Branches 400 Tags 460 MiB
03ffaed3f0
Commit Graph

4351 Commits

Author SHA1 Message Date
Michael Niedermayer
b50efe85ea avfilter/vf_colormatrix: update output AVFrame colorspace 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-28 21:52:02 +01:00
Michael Niedermayer
3e41e747d6 avfilter/vf_colormatrix: Support using the source AVFrame colorspace if none is specified 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-28 21:52:00 +01:00
Michael Niedermayer
214a3b8bf9 avfilter/vf_scale: simplify alignment code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-25 16:54:24 +01:00
Michael Niedermayer
1e48c39ece avfilter/vf_scale: do aspect ratio and scale factor compensation together 
Fixes rounding error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-25 16:48:13 +01:00
Lars Kiesow
69b1d1d99b Documentation for scale filter factor 2014-01-25 15:02:15 +01:00
Lars Kiesow
e395f8de5a Fixed factor for scale filter 2014-01-25 15:00:02 +01:00
Lars Kiesow
7fc4c18463 Factors for scale filter 2014-01-25 14:40:48 +01:00
Ramiro Polla
78a9f185eb lavfi/drawtext: add option for drawing border around text 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-25 04:59:28 +01:00
Ramiro Polla
222fb8276d lavfi/drawtext: get bitmap from glyph in a separate step 
This change makes it possible to transform the glyph or get its border before
turning it into a bitmap.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-25 04:46:38 +01:00
Michael Niedermayer
41003da94a avfilter/avfilter: fix use of uninitialized pointer 
Fixes CID1163852
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-24 04:14:52 +01:00
Nicolas George
2dc5980d61 lavfi/dualinput: fix shortest option. 
Fix trac ticket #3315.
 2014-01-19 17:13:36 +01:00
Nicolas George
77b8d4e521 lavfi/vf_tile: use av_make_q. 2014-01-19 17:13:02 +01:00
Nicolas George
c4b7ad324b lavfi/avf_concat: use av_make_q. 2014-01-19 17:12:50 +01:00
Nicolas George
bf9908c627 lavfi/af_amerge: use av_make_q. 2014-01-19 17:12:40 +01:00
Stefano Sabatini
3dc494f8b9 lavfi/vidstabtransform: apply various documentation/option minor fixes 
Improve consistency with the rest of the documentation.
 2014-01-19 12:20:10 +01:00
João Bernardo
447d71b892 avfilter/vf_elbg: Fixed seed range of elbg filter 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 21:17:43 +01:00
Michael Niedermayer
cd259cdaa9 Merge commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3' 
* commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3':
  buffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly

Conflicts:
	libavfilter/buffersrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-17 16:38:10 +01:00
Anton Khirnov
104a97beaf buffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly 2014-01-17 10:30:45 +01:00
Stefano Sabatini
a64333db5f lavfi/vidstabtransform: apply various cosmetical nits 2014-01-16 12:35:17 +01:00
Georg Martius
2727dbb053 lavfi/vidstabdetect,vidstabtransform: update to vid.stab 0.98 
In particular:
* set default value for accuracy to 15 (max)
* add zoomspeed for dynamic zoom (optzoom=2)
* make camera path optimization algorithm configurable
* update optzoom documenation in code to use new localmotions calculation function commandline arguments
* add debug option in vidstabtransform

Signed-off-by: Georg Martius <martius@mis.mpg.de>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-01-16 12:23:48 +01:00
Robert Krüger
194ef56ba7 Change license of yadif from GPL to LGPL 
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 14:19:15 +01:00
Robert Krüger
6109399366 Revert "avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects"" 
This reverts commit 4ef4bb4a20.

Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 14:19:15 +01:00
Robert Krüger
99c4abfe88 Revert "Revert "yadif: add parens around macro parameters"" 
This reverts commit ab00800cde.

Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 14:19:14 +01:00
Robert Krüger
4a38eeec38 Revert "Revert "vf_yadif: move x86 init code to x86/yadif.c"" 
This reverts commit 975110a85e.

Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 14:19:14 +01:00
Robert Krüger
d8e763fda7 vf_yadif: Relicense from GPL to LGPL 
All copyright holders have agreed to the relicensing.
 2014-01-14 00:04:59 +01:00
Michael Niedermayer
d9481dcd61 Merge commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24' 
* commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24':
  avfilter: fix leaks on error in ff_filter_frame

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-10 03:46:28 +01:00
Michael Niedermayer
8788d31606 Merge commit '5655732c77f2df9c1dfbddc30cd4844390a6921f' 
* commit '5655732c77f2df9c1dfbddc30cd4844390a6921f':
  avfilter: add needs_writable field to the internal AVFilterPad structure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-10 03:37:03 +01:00
Michael Niedermayer
48276731d6 Merge commit 'd44bd7fb27d4121512eae0ffce5e48bac25e82dc' 
* commit 'd44bd7fb27d4121512eae0ffce5e48bac25e82dc':
  avfilter: add documentation for needs_writable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-10 03:34:52 +01:00
Michael Niedermayer
402a411406 Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6' 
* commit 'a7d0e7ead95e584c4866617f046b2493066975c6':
  lavfi: add framepack filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/allfilters.c
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-10 03:00:48 +01:00
Vittorio Giovara
abb5e37f64 avfilter: fix leaks on error in ff_filter_frame 2014-01-09 23:13:05 +01:00
Vittorio Giovara
5655732c77 avfilter: add needs_writable field to the internal AVFilterPad structure 2014-01-09 23:13:05 +01:00
Vittorio Giovara
d44bd7fb27 avfilter: add documentation for needs_writable 2014-01-09 23:13:05 +01:00
Vittorio Giovara
a7d0e7ead9 lavfi: add framepack filter 2014-01-09 23:13:05 +01:00
Michael Niedermayer
c0a33c4770 avfilter: avfilter_register() that works in O(1) time 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-09 00:53:04 +01:00
Luca Barbato
d68dc3c944 drawtext: Drop pointless header 
It should be forward compatible with newer freetype.
 2014-01-06 11:44:10 +01:00
Michael Niedermayer
ee16e0cacc avfilter/vf_format: check that the format list is not empty 
Fixes Ticket3210

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-05 20:14:03 +01:00
Clément Bœsch
307b6b8cb4 avfilter/lut3d: fix channel order in Iridas format parsing. 
According to http://doc.iridas.com/index.php?title=LUT_Formats

    for 3D textures, the data is also RGB, and ordered in such a way
    that the red coordinate changes fastest, then the green coordinate,
    and finally, the blue coordinate changes slowest:

Fixes Ticket #3236.
 2014-01-04 09:42:31 +01:00
Reimar Döffinger
3cc0f335fe af_aresample: remove only use of array compound literals with non-const initializers in FFmpeg. 
Some older compilers might have particular trouble with them,
and they do not really seem worth it to me.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-12-30 12:38:04 +01:00
Michael Niedermayer
25b243759c Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0' 
* commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0':
  avutil: Move library version related macros to version.h

Conflicts:
	libavcodec/version.h
	libavresample/version.h
	libavutil/avutil.h
	libavutil/utils.c

See: 183117fed7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-27 12:01:23 +01:00
Diego Biurrun
b83d1ee3b4 avutil: Move library version related macros to version.h 
This is a more sensible place for these macros.
 2013-12-26 19:05:22 +01:00
Clément Bœsch
ec73bd1fe8 avfilter/avectorscope: fix {} mistake in alloc check. 2013-12-26 13:49:15 +01:00
Stefano Sabatini
cd355d4d59 lavfi/abuffersrc: use AV_OPT_TYPE_SAMPLE_FMT for sample_fmt option 
Simplify/extend syntax.
 2013-12-26 11:35:27 +01:00
Stefano Sabatini
3b8c7da7a3 lavu,lavfi,lavd: do not hardcode AV_PIX_FMT_NB value when setting pixel format max value 
The constant may change in libavutil but the library may be compiled
against an older version, thus rejecting a value which is otherwise
supported by the new libavutil.

INT_MAX is used here to denote the max allowed value for a pixel format.

The opt-test code is changed to provide a valid reference example.
 2013-12-26 11:35:27 +01:00
Stefano Sabatini
baeda2bf92 lavfi/volume: fix NULL reference in filter_frame() 
Fix crash.
 2013-12-25 19:13:23 +01:00
Stefano Sabatini
ca0d8e839e lavfi/volume: extend volume logging 2013-12-25 18:26:34 +01:00
Stefano Sabatini
97aa554634 lavfi/volume: implement process_command() callback, with the volume command 
Address trac ticket #2868.
 2013-12-25 18:25:53 +01:00
Stefano Sabatini
7619a87cc8 lavfi/volume: support volume expression and per-frame expression evaluation 
The eval mode allows to evaluate the expression per-frame or just at
init.

In particular, address ticket #3234.
 2013-12-25 18:25:04 +01:00
Stefano Sabatini
d055a1395c lavfi/hue: show first decimal value of saturation 2013-12-20 19:25:42 +01:00
Stefano Sabatini
028d8dd367 lavfi/hue: use av_clip_uint8() instead of av_clip_uint8_c() 
The generic version should be faster if optimized.
 2013-12-20 19:13:42 +01:00
Stefano Sabatini
70e74e0072 lavfi/hue: force table initialization for the first frame 2013-12-20 19:13:42 +01:00
Lenny Wang
d943330dc0 lavfi/deshake_opencl: optimze transform filter 
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-19 13:31:31 +01:00
Michael Niedermayer
a788949255 Merge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d' 
* commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d':
  Bump major of libavfilter for reference counted buffer API changes.

Conflicts:
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-16 22:07:24 +01:00
Stefano Sabatini
023693d786 lavfi/buffersrc: set min and max values for pix_fmt option 
Currently the min and max values are not honored, but this will change in
a following patch.
 2013-12-16 18:08:17 +01:00
Reinhard Tartler
6d3ea1957f Bump major of libavfilter for reference counted buffer API changes. 
Applications that have been linked against an older release of Libav and pick up
updated libraries experience segmentation faults because they pick up the new
libavfilter, which assumes AVFrames have been allocated by libavutil and thus
contain new reference-counting related fields. This will break for AVFrames that
have been allocated by old libavcodec.

All scheduled API changes are deferred to the next bump.
 2013-12-14 16:31:32 -05:00
Michael Niedermayer
47eb15b989 avfilter/vf_pullup: fix memleak on error 
Fixes CID1108604

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 15:14:03 +01:00
Michael Niedermayer
8f9569cfac avfilter/vf_pullup: Factor free_field_queue() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 15:13:01 +01:00
Michael Niedermayer
0fe6906d96 avfilter/aeval: Fix use of uninitialized variable 
Fixes CID1135776

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 15:31:32 +01:00
Alexander Strasser
cea5812fa7 configure: Special case libfreetype test 
Include the freetype header, in-directly through a macro, like it
is done in the drawtext filter. Do not break if the header is moved.

Unfortunately the drawtext filter included the file where the include
macros are defined in a wrong way. This is not needed and breaks the
build. Remove that #include line too.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2013-12-08 18:21:46 +01:00
Michael Niedermayer
bc9cee98c0 avfilter/vf_mergeplanes: specify pixel format min/max 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-08 16:07:19 +01:00
Michael Niedermayer
133fbfc781 do O(1) instead of O(n) atomic operations in register functions 
about 1ms faster startup time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 15:27:36 +01:00
Stefano Sabatini
8f1edc73a8 lavfi: rename asrc_aevalsrc.c to aeval.c 
The file now contains both source and filter, the new name looks more
appropriate.
 2013-12-06 10:57:28 +01:00
Stefano Sabatini
e424abc3a0 lavfi: add aeval filter 2013-12-06 10:57:26 +01:00
Stefano Sabatini
405b3eb535 lavfi/aevalsrc: duplicate last expression for the missing channels 
Use last expression for the missing channel expressions in case the
channel layout was specified. Enhance flexibility.
 2013-12-06 10:51:12 +01:00
James Almer
56572787ae Add Windows resource file support for shared libraries 
Originally written by James Almer <jamrial@gmail.com>

With the following contributions by Timothy Gu <timothygu99@gmail.com>

* Use descriptions of libraries from the pkg-config file generation function
* Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser)
* Use "FFmpeg" for ProductName as MSDN says "name of the product with which the
  file is distributed" [1].
* Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1].
* Only build the .rc files when --enable-small is not enabled.

[1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-05 23:42:07 +01:00
Michael Niedermayer
0cc5011f9a avfilter/vf_pad: fix req_end 
Fixes out of array accesses
Fixes Ticket3190

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-03 04:09:10 +01:00
Stefano Sabatini
d5d51cf04d lavfi/volume: support all channel counts 2013-12-02 23:52:24 +01:00
Michael Niedermayer
975110a85e Revert "vf_yadif: move x86 init code to x86/yadif.c" 
This reverts commit a87b17f328.
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier

Conflicts:

	libavfilter/vf_yadif.c
	libavfilter/x86/yadif.c
	libavfilter/x86/yadif_template.c
	libavfilter/yadif.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-01 20:26:26 +01:00
Michael Niedermayer
ab00800cde Revert "yadif: add parens around macro parameters" 
This reverts commit 49e617f956.
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier

Conflicts:

	libavfilter/vf_yadif.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-01 20:26:26 +01:00
Michael Niedermayer
4ef4bb4a20 avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects" 
This reverts commit 568c70e79e.
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-01 20:26:26 +01:00
James Almer
19e301b9ed lavfi/Makefile: Don't compile lavfutils.c and lswsutils.c if they are not needed 
They are only needed by removelogo.
This fixes a link failure in shared builds when compiling with
removelogo disabled but Lavf/SwS enabled

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-30 13:29:27 +01:00
Michael Niedermayer
ccdfa3e271 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add missing #includes for *INT64_MAX and *INT64_C

Conflicts:
	ffmpeg.c
	ffmpeg_filter.c
	ffplay.c
	libavformat/assdec.c
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-24 05:21:19 +01:00
Diego Biurrun
8f8bc92365 Add missing #includes for *INT64_MAX and *INT64_C 2013-11-23 21:55:52 +01:00
Stefano Sabatini
98786aa2f0 lavfi/aevalsrc: initialize pointer to expression to NULL 
Fix crash in case of expression parsing failure.
 2013-11-21 23:14:38 +01:00
Clément Bœsch
ddaf543aa6 avfilter/showspectrum: use 0 dummies for range in const. 
This is consistent with other options.
 2013-11-20 16:38:09 +01:00
Clément Bœsch
9343fc30e2 avfilter/showspectrum: reindent const options. 2013-11-20 16:37:34 +01:00
Clément Bœsch
9c8b240806 avfilter/showspectrum: add blackman window. 2013-11-20 16:35:48 +01:00
Clément Bœsch
3e69f7c221 avfilter/showspectrum: add win_func option. 2013-11-20 16:22:05 +01:00
Michael Niedermayer
6a71efff33 avfilter/vf_tinterlace: check clone return value 
Inspired by: 3a16ec19d2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 18:08:58 +01:00
Michael Niedermayer
0a382aa99b Merge commit '3a16ec19d2426457419cb8a7304f97982699efda' 
* commit '3a16ec19d2426457419cb8a7304f97982699efda':
  vf_interlace: check one av_frame_clone allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 18:06:40 +01:00
Vittorio Giovara
3a16ec19d2 vf_interlace: check one av_frame_clone allocation 2013-11-19 14:48:36 +01:00
Vallimar
6f5c36832d avfilter/vf_mp: fix missing FF_API_XVMC check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 01:22:30 +01:00
Michael Niedermayer
0ee905e243 Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 
* commit '5b9c3b4505206143d85398c1410949319fa1180f':
  Replace all instances of avcodec_alloc_frame() with av_frame_alloc().

Conflicts:
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	libavcodec/alacenc.c
	libavcodec/libopenjpegenc.c
	libavcodec/libvpxenc.c
	libavcodec/pcm.c
	libavcodec/xbmenc.c
	libavcodec/xwdenc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-16 23:54:10 +01:00
Alex Sukhanov
86b3435fc0 af_aresample: Fix timestamp of first padded PCM audio packet 
Problem:
ffmpeg generated video file which had two audio packets with the same timestamp: last original audio packet and first padded audio packet.

Timestamp of first added audio packet by 'apad' fitler had the same value as last original audio packet. The problem was in 'aresample' fitler, which used next pts instead of current one.
As long as 'apad' and 'aresample' filters have separate mechanisms of timestamp calculation, they got the same values.

Command line:
ffmpeg -i <input_filename> -shortest -apad 512 -af asetnsamples=n=512 -b:a 1058400 -ac 1 -ar 44100 -async 0 -acodec pcm_s16le -sn -f matroska -y <output_file>

Fix:
Call swr_next_pts() function before swr_convert()

Tested:
FATE tests passed.
Fix has been tested in our Transcoder regression framework on ~10k test videos. It's about ~500k transcodes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-15 11:54:02 +01:00
Stefano Sabatini
8cd3685a3f lavfi: add elbg filter 2013-11-13 11:21:57 +01:00
Clément Bœsch
199b8fbd09 avfilter/fade: use FADE_OUT macro. 2013-11-10 19:16:45 +01:00
Clément Bœsch
981128c2c1 avfilter/fade: remove a bunch of useless parenthesis. 2013-11-10 19:15:48 +01:00
Clément Bœsch
461e810cfc avfilter/fade: use inlink->frame_count. 2013-11-10 19:12:36 +01:00
Clément Bœsch
3e1097b909 avfilter/fade: add color option. 
Fixes Ticket #1822.
 2013-11-10 19:05:08 +01:00
Michael Niedermayer
175e689cc5 avfilter/graphparser: zero filter_ctx in case of deallocation in create_filter() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 23:38:44 +01:00
Michael Niedermayer
ec8e68c763 Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c' 
* commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
  avfilter/graphparser: Directly free filter memory if initialization fails

Conflicts:
	libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 23:05:26 +01:00
Lenny Wang
7c02a77d25 avfilter/unsharp: added optimized opencl kernels 
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 22:31:43 +01:00
Paul B Mahol
d9d752cfb5 avfilter/af_aecho: free input frame after it is being used 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-07 17:45:47 +00:00
Michael Niedermayer
ea6331b2c6 avfilter/af_aresample: Calculate output buffer size more precisely. 
Fixes accumulation of data in case of significant silence injections

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-06 23:54:02 +01:00
Diego Biurrun
cffecc0e7e avfilter/graphparser: Directly free filter memory if initialization fails 2013-11-06 22:06:15 +01:00
Lenny Wang
89a3be8921 avfilter/opencl: compile kernels separately 
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 14:29:55 +01:00
Michael Niedermayer
be74cb5159 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer

Conflicts:
	libavfilter/buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 12:17:35 +01:00
Stefano Sabatini
988e2e7c1c lavfi/ladspa: cast return value of av_x_if_null to char*, fix warnings 2013-11-05 00:04:17 +01:00
Diego Biurrun
7d1a68e95b avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer 
The function is used in a block of code that is deprecated anyway.
 2013-11-04 23:04:10 +01:00
Diego Biurrun
e73996954d filtfmts-test: Fix use of deprecated API 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2013-11-04 16:20:44 +01:00
Michael Niedermayer
d0ac60730d avfilter/vf_scale: add ov/hsub 
Suggested-by: divVerent
Reviewed-by: Stefano
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 15:23:26 +01:00
Vittorio Giovara
446e37dc97 vf_fieldorder: remove superfluous get_video_buffer 2013-11-04 14:37:06 +01:00
Paul B Mahol
3d9fc5c6ad avfilter/vf_aspect: remove dupe constants setup 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-03 16:39:22 +00:00
Michael Niedermayer
2ed562d5fa Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavfi/af_pan: support unknown layouts on input.
  lavfi/af_pan: support unknown layouts on output.
  lswr: fix assert failure on unknown layouts.
  lavfi: parsing helper for unknown channel layouts.
  lavfi/avfiltergraph: do not reduce incompatible lists.
  lavfi/avfiltergraph: suggest a solution when format selection fails.
  lavd/lavfi: support unknown channel layouts.
  lavf/wavenc: check for a single stream.
  lavd/alsa: add stream validation
  lavd/alsa: fix timestamp calculation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 13:57:05 +01:00
Michael Niedermayer
a75bf4e5c1 Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7' 
* commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7':
  vf_aspect: support variables in evaluating the aspect ratios

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/vf_aspect.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 11:54:19 +01:00
Nicolas George
7b0a587393 lavfi/af_pan: support unknown layouts on input. 
Fix trac ticket #2899.
 2013-11-03 10:30:50 +01:00
Nicolas George
4e9adc9b73 lavfi/af_pan: support unknown layouts on output. 2013-11-03 10:30:47 +01:00
Nicolas George
6e2473edfd lavfi: parsing helper for unknown channel layouts. 
Make ff_parse_channel_layout() accept unknown layouts too.
 2013-11-03 10:30:25 +01:00
Nicolas George
d300f5f6f5 lavfi/avfiltergraph: do not reduce incompatible lists. 
A list of "all channel layouts" but not "all channel counts"
can not be reduced to a single unknown channel count.
 2013-11-03 10:30:16 +01:00
Nicolas George
f775eb3fb4 lavfi/avfiltergraph: suggest a solution when format selection fails. 
Format selection can fail if unknown channel layouts are used
with filters that do not support it.
 2013-11-03 10:30:08 +01:00
Rudolf Polzer
3a14b160bd vf_scale: make the dar variable return the DAR. 
Before, it just returned width/height. Correct is width/height*sar.

That way it is consistent with DAR as in probe output and setdar.

Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-02 21:16:29 +01:00
Rudolf Polzer
34a0ac41a8 vf_aspect: support variables in evaluating the aspect ratios 
Example: -vf setsar=sar="sar*9/10"

Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-02 21:14:08 +01:00
Michael Niedermayer
599c285162 avfilter/vf_gradfun: add emms_c() for mmxext 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 14:42:06 +01:00
Clément Bœsch
969329fe11 Revert "Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'" 
This reverts commit fc5fe4804f, reversing
changes made to ffe3350098.

The factoring is broken; it's not calling the ssse3 code anymore, and
calling the mmx2 code with bad alignment. It also broke some FATE
instances.

Conflicts:
	libavfilter/x86/vf_gradfun_init.c
 2013-11-01 14:28:08 +01:00
Michael Niedermayer
c6125f5e1c avfilter/x86/vf_gradfun_init: fix some consts & related warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 14:20:10 +01:00
Michael Niedermayer
fc5fe4804f Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191' 
* commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191':
  gradfun: x86: Factor out common code for some gradfun_filter_line() variants

Conflicts:
	libavfilter/x86/vf_gradfun_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 10:26:49 +01:00
Michael Niedermayer
ffe3350098 Merge commit 'ee80cf741a44115758e62399b7bde08d33161151' 
* commit 'ee80cf741a44115758e62399b7bde08d33161151':
  avfilter: x86: K&R formatting cosmetics

Conflicts:
	libavfilter/x86/vf_gradfun_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 10:20:20 +01:00
Diego Biurrun
ed1a11ed52 gradfun: x86: Factor out common code for some gradfun_filter_line() variants 2013-10-31 16:34:18 +01:00
Diego Biurrun
ee80cf741a avfilter: x86: K&R formatting cosmetics 2013-10-31 12:15:54 +01:00
Carl Eugen Hoyos
e4b0a77021 libavfilter/decimate: Add pts of first frame to all frames. 
Fixes ticket #3019

Reviewed-by: Clément Bœsch
 2013-10-31 11:24:43 +01:00
Michael Niedermayer
325f6e0a97 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: do not export the filters from shared objects

Conflicts:
	libavfilter/af_amix.c
	libavfilter/af_anull.c
	libavfilter/asrc_anullsrc.c
	libavfilter/f_select.c
	libavfilter/f_settb.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_colorbalance.c
	libavfilter/vf_copy.c
	libavfilter/vf_crop.c
	libavfilter/vf_cropdetect.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_format.c
	libavfilter/vf_framestep.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_hflip.c
	libavfilter/vf_libopencv.c
	libavfilter/vf_lut.c
	libavfilter/vf_null.c
	libavfilter/vf_overlay.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_unsharp.c
	libavfilter/vf_vflip.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 11:58:11 +01:00
Anton Khirnov
cd43ca0443 lavfi: do not export the filters from shared objects 2013-10-28 15:29:54 +01:00
Michael Niedermayer
a1ce060c51 Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e' 
* commit '5c439b41d0489412c0a4cf6dfb98915251677b8e':
  avfilter: have avfilter_get_by_name return const for next bump

Conflicts:
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 13:07:05 +01:00
Vittorio Giovara
884c7a6eb8 avfilter: fix const use of avfilter_next 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-28 07:58:23 +01:00
Vittorio Giovara
5c439b41d0 avfilter: have avfilter_get_by_name return const for next bump 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-28 07:57:44 +01:00
Paul B Mahol
75b2bbe21d libavfilter/vf_noise: relicense to LGPL 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-27 20:29:07 +00:00
Derek Buitenhuis
52aed19307 avfiltergraph: Properly handle memory allocation failure 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-27 19:15:03 +00:00
Paul B Mahol
292902ea9f avfilter: add mergeplanes filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-27 18:58:43 +00:00
Benedict Endemann
696aa74b1a lavfi/overlay: correct small error in intersection detection 
The image size of the destination image was used to determine if a source
image was positioned outside the destination image, that no intersection
could occur.  Actually for these two cases the size of the source image
has to be used!

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-27 15:01:02 +01:00
Michael Niedermayer
a826efb55a avfilter/x86/vf_gradfun_init: fix const and related warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-24 12:12:59 +02:00
Michael Niedermayer
1ea28ffc4d Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e' 
* commit '0e730494160d973400aed8d2addd1f58a0ec883e':
  avfilter: x86: Port gradfun filter optimizations to yasm

Conflicts:
	libavfilter/x86/vf_gradfun_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-24 10:35:39 +02:00
Paul B Mahol
426abbb632 avfilter/libmpcodecs/vf_eq: remove useless storage class specifier in empty declaration 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-24 07:44:23 +00:00
Robert Krüger
83922cccb2 avfilter/vf_scale: Correct vf_scale mappings from arguments to color range 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-23 15:44:31 +02:00
Daniel Kang
0e73049416 avfilter: x86: Port gradfun filter optimizations to yasm 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-10-23 14:50:27 +02:00
Michael Niedermayer
f4f8499c19 Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d' 
* commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d':
  avfilter: Fix typo in Loren's email address

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-23 12:14:49 +02:00
Diego Biurrun
f6633c55a3 avfilter: Fix typo in Loren's email address 2013-10-23 10:25:14 +02:00
Michael Niedermayer
f94124c23e Merge commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20' 
* commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20':
  vf_fieldorder: log when processing is skipped

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 19:26:42 +02:00
Derek Buitenhuis
692b930904 lavfi/pthread: Avoid crashes/odd behavior caused by spurious wakeups 
This is similar to 5152196b2b.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-22 17:05:26 +01:00
Derek Buitenhuis
3511d4fc97 pthread: Avoid crashes/odd behavior caused by spurious wakeups 
This is similar to 5152196b2b.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-22 13:24:01 +01:00
Vittorio Giovara
00d7369de0 vf_fieldorder: log when processing is skipped 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-22 10:58:25 +02:00
Paul B Mahol
c9660999b9 avfilter: replaygain scanner 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-21 19:56:55 +00:00
Michael Niedermayer
ab2bfb85d4 avfilter/ff_insert_pad: fix order of operations 
Fixes out of bounds access
Fixes CID732170
Fixes CID732169

No filter is known to use this function in a way so the issue can be reproduced.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-21 16:43:25 +02:00
Michael Niedermayer
d5ec8ba7f2 Do not leave positive values undefined when negative are defined as error 
Define positive return values as non errors and leave further meaning undefined
This allows future extensions to use these values

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 16:42:57 +02:00
Michael Niedermayer
005200887b Merge commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc' 
* commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc':
  pthread: Fix deadlock during thread initialization

Conflicts:
	libavcodec/pthread.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-14 00:04:52 +02:00
Derek Buitenhuis
eb90a2091f pthread: Fix deadlock during thread initialization 
Sometimes, if pthread_create() failed, then pthread_cond_wait() could
accidentally be called in the worker threads after the uninit function
had already called pthread_cond_broadcast(), leading to a deadlock.

Don't call pthread_cond_wait() if c->done is set.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-13 05:50:00 -04:00
Paul B Mahol
cfc9a4c732 avfilter/vsrc_testsrc: smpte(hd)bars: use yuv directly 
Also set color space.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-12 18:40:15 +00:00
Paul B Mahol
1d8ce109e9 avfilter/vf_separatefields: do not reset pts to 0 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-12 15:10:19 +00:00
Michael Niedermayer
aeddc6e3a5 avfilter/lavfutils: fix memleak of avpacket 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:52:10 +02:00
Michael Niedermayer
eedfee12c6 avfilter/vf_removelogo: fix pixel pointer so it points where its intended 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:36:55 +02:00
Michael Niedermayer
8c582d1b22 avfilter/vf_removelogo: fix offset for accessing pixels above and below 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:35:54 +02:00
Michael Niedermayer
8c0687abdf avfilter/vf_removelogo: use av_freep() for saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:31:38 +02:00
Paul B Mahol
d1d875d301 avfilter/vf_w3fdif: do not reset pts to 0 
Shamelessly stolen from yadif.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-10 15:08:55 +00:00
Michael Niedermayer
0f322feffd avfilter/buffersink: try to fix AV_NOPTS_VALUE 
no testcase available, just found this issue by reading the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 16:33:18 +02:00
Michael Niedermayer
8780f7fbfa avfilter/ff_filter_frame_needs_framing: fix handling of AV_NOPTS_VALUE 
Fixes Ticket3015

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 16:33:18 +02:00
Paul B Mahol
162e22e144 avfilter/af_join: remove now unnecessary goto 
Options are freed from the generic code now, there is no need to call
av_opt_free() from the filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-08 12:40:33 +00:00
Michael Niedermayer
728bb910ec avfilter/vf_deshake: fix block_contrast() lower brightness value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-07 22:05:14 +02:00
Lenny Wang
2779b7b30a avfilter/deshake 
The old row index looks weird and wrong to me

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-07 21:39:16 +02:00
Michael Niedermayer
b8866783c6 avfilter/lswsutils: dont override the default scaler 
This should make no difference as this code is only used by removelogo which
seems to refuse to use masks of different size.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-07 13:28:13 +02:00
Paul B Mahol
ad934bc353 avfilter/vf_drawtext: remove dead initialization 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-07 08:40:17 +00:00
Paul B Mahol
ce26a016cd avfilter/vf_phase: remove dead initialization 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-07 08:28:00 +00:00
Michael Niedermayer
3ee796760a avfilter/vf_scale: dont duplicate default. 
use the defaults set by swscale

Suggested-by: stefano
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-06 12:39:47 +02:00
Michael Niedermayer
931a4b433d avfilter/vf_scale: change the default scaler to bicubic 
See: [FFmpeg-devel] [PATCH] swscale/options: switch default to bicubic
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-06 11:00:48 +02:00
Paul B Mahol
746e3142ee avfilter/f_interleave: use the name 's' for the pointer to the private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-05 19:16:55 +00:00
Paul B Mahol
9665217a75 avfilter/af_silencedetect: support more sample formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-05 11:59:34 +00:00
Paul B Mahol
a2c14ba2b1 avfilter/vf_histogram: use const for variables that are not supposed to change 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-04 16:48:19 +00:00
Michael Niedermayer
02a6ee5168 avfilter/vf_frei0r: fix out of array read 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-04 11:16:35 +02:00
Paul B Mahol
5f99e6d632 avfilter/vf_pullup: do not ignore frame field order 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-03 02:43:20 +00:00
Marton Balint
0362cf1a19 avfilter/vf_histogram: add mirrored waveform mode 
Added parameter to mirror the waveform (high values are shown on top in column mode)

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-02 21:02:59 +00:00
Marton Balint
5b5bb0d81c avfilter/vf_histogram: fix segfault in parade waveform mode for subsampled formats 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-02 21:02:54 +00:00
Michael Niedermayer
c4f3b55f50 Merge commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76' 
* commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76':
  vf_interlace: do not process an already interlaced frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-03 11:16:57 +02:00
Vittorio Giovara
06e7301a2e vf_interlace: do not process an already interlaced frame 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-02 16:40:49 +02:00
Clément Bœsch
3841e4510b avfilter/avf_showspectrum: use the name 's' for the pointer to the private context 2013-10-02 11:37:53 +00:00
Paul B Mahol
848a1e6738 avfilter/af_afade: use the name 's' for the pointer to the private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-02 11:37:52 +00:00
Clément Bœsch
e31a239fea avfilter/vf_removelogo: use the name 's' for the pointer to the private context 2013-10-02 10:54:11 +00:00
Paul B Mahol
7d0ce1e59d avfilter/af_silencedetect: use the name 's' for the pointer to the private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-02 10:28:28 +00:00
Paul B Mahol
edadda968c avfilter/vf_histogram: change order of histograms for planar rgb 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-01 21:22:22 +00:00
Marton Balint
cac9af68a4 avfilter/vf_histogram: add support for subsampled planar yuv modes in waveform mode 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-01 21:04:31 +00:00
Marton Balint
31a8461d64 avfilter/vf_histogram: improve waveform speed 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-01 21:04:30 +00:00
Paul B Mahol
0a4aea6db9 avfilter/vf_hflip: support slice threading 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-30 13:08:55 +00:00
Paul B Mahol
2a6a3d4317 avfilter/vf_hflip: refactor plane dimensions calculation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-30 13:08:55 +00:00
Paul B Mahol
862773907a avfilter/vf_rotate: support slice threading 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-30 13:08:55 +00:00
Paul B Mahol
cd1b22d8e8 avfilter/dualinput: simplify 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-30 08:47:40 +00:00
Paul B Mahol
61274193e3 avfilter/vf_rotate: use vsub for output plane height calculation 
Output plane height used horizontal instead of vertical subsampling.
This is just cosmetic change as filter does not support formats where
vertical subsampling does not match horizontal one.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-29 19:24:27 +00:00
Paul B Mahol
88c8ed18c9 avfilter/dualinput: remove unused variable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-28 14:33:30 +00:00
Michael Niedermayer
7381d31f22 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: allow user-provided execute() callbacks

Conflicts:
	libavfilter/avfilter.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-28 11:02:01 +02:00
Anton Khirnov
0767bfd199 lavfi: allow user-provided execute() callbacks 2013-09-28 08:06:19 +02:00
Paul B Mahol
b890198b66 avfilter: add av_cold to init() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-27 18:51:49 +00:00
Georg Martius
e064d0aaf6 avfilter/vidstabtransform: update optzoom range values for recent vid.stab update. 
Signed-off-by: Georg Martius <martius@mis.mpg.de>
 2013-09-27 16:48:31 +00:00
Paul B Mahol
191ee4aefb avfilter/af_ladspa: set output channel layout for passthrough case 
For cases when plugin does not return any samples we just return
input samples. Previously channel layout for outlink was not set.
Set it explicitly instead.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-27 12:51:08 +00:00
Paul B Mahol
110a2f446d avfilter/af_ladspa: allow changing controls dynamically 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-27 12:49:55 +00:00
Paul B Mahol
4d86a945df avfilter/af_ladspa: refactor code setting input control ports values 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-27 12:49:54 +00:00
Nicolas George
231e50157c lavfi/dualinput: reimplement on top of framesync. 2013-09-23 09:50:09 +02:00
Nicolas George
53319d5c93 lavfi: add an API to synchronize multiple video inputs. 
Compared to dualinput, this API can handle more than two
inputs and can generate frames synchronized to any or all
input streams.
 2013-09-23 09:49:37 +02:00
Paul B Mahol
601eab2bbf avfilter: add ladspa wrapper filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-22 16:36:10 +00:00
Michael Niedermayer
4bc7a2a64b avfilter: remove duplicate includes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-21 15:36:33 +02:00
Paul B Mahol
59d72f8b16 lavfi/pad,crop,scale: remove options description from filter description 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-21 12:50:02 +00:00
Paul B Mahol
8ac0eb2cd7 avfilter/vf_tinterlace: add yuv411p, yuv440p, yuva422p and yuva444p 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-21 12:48:24 +00:00
Michael Niedermayer
68f328fcdd avfilter/vf_psnr: avoid 64bit arithmetic in the inner loop 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-21 03:11:02 +02:00
Neil Birkbeck
a11c16a0b0 avfilter/vf_psnr: Prevent integer overflow. 
The 32-bit integer accumulator in MSE computation can overflow for 8-bit frame data.
(e.g., for 1080p white frame compared to a black frame can give sum of 255*255*1080*1920 > 2^32).

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-21 03:10:45 +02:00
Paul B Mahol
20101f4a83 avfilter/vf_decimate: add gray16 and yuv440p 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-19 17:53:05 +00:00
Paul B Mahol
0ad5ef674b avfilter/vf_decimate: fix crash with gray8 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-19 17:50:42 +00:00
Paul B Mahol
390c35a13b lavfi/mp: remove mp=qp 
The filter does nothing.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-19 15:53:45 +00:00
Paul B Mahol
2e35686030 avfilter/vf_telecine: remove redudant av_frame_copy_props() 
It is already called by av_frame_clone().

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 19:17:34 +00:00
Paul B Mahol
7f4a5006ce avfilter/vf_pullup: remove junk_down nonsense 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 12:47:57 +00:00
Paul B Mahol
d520055000 avfilter/vf_pullup: change log level to error 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 11:56:36 +00:00
Paul B Mahol
fe5b7612c0 avfilter/vf_pullup: fix memleak of metrics for last PullupField 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 11:56:35 +00:00
Paul B Mahol
394a73cad2 avfilter/vf_pullup: make sure metric_plane is available 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 11:27:41 +00:00
Paul B Mahol
8302abf844 lavfi/mp: remove mp=pullup 
The filter was ported to a native libavfilter filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 11:05:27 +00:00
Paul B Mahol
112017e990 avfilter/x86/vf_pullup: try to fix build on x64 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-17 17:20:58 +00:00
Paul B Mahol
9c774459a9 avfilter: port pullup filter from libmpcodecs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-17 17:03:36 +00:00
Paul B Mahol
9d05de2258 avfilter: add adelay filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-16 14:33:07 +00:00
Paul B Mahol
563057731a avfilter/vf_stereod3d: add const qualifiers to ana_convert() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-16 12:37:29 +00:00
Paul B Mahol
c74d5929df avfilter/vf_stereo3d: BGR24 support for anaglyphs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-16 12:37:29 +00:00
Paul B Mahol
fcea6f71ad avfilter/vf_stereo3d: avoid pointless copy 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-16 12:37:29 +00:00
Paul B Mahol
7ac6c6325e libavfilter/libmpcodecs: remove unused files 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-15 21:43:04 +00:00
Paul B Mahol
24678a61d9 avfilter/vf_gradfun: use av_calloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-15 19:07:02 +00:00
Paul B Mahol
693747c3d0 avfilter/vsrc_life: use av_calloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-15 19:07:01 +00:00
Michael Niedermayer
3dfc5f551f avfilter: avoid testing float == 0 
This fixes the hypothetical case of rounding errors causing
incorrect values to be used.
We do not use *_EPSILON, because non trivial expressions can contain
errors larger than that making a zero equality test with *_EPSILON
unreliable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-15 15:33:39 +02:00
Paul B Mahol
60abdb6c17 avfilter/af_aecho & af_compand: use extended_data 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-15 12:10:12 +00:00
Paul B Mahol
211a185cba avfilter/avfilter: check allocation failure in ff_insert_pad() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-15 11:09:23 +00:00
Paul B Mahol
7d8939a0ff avfilter/avf_avectorscope: improve description 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-14 12:11:22 +00:00
Paul B Mahol
b8b398027c avfilter/video: remove commented out cruft 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-13 19:17:56 +00:00
Michael Niedermayer
126ba68826 avfilter/vf_noise: rename linesize to bytewidth 
Its the width in bytes and not the linesize or stride.
This makes the naming more consistent with the rest of the codebase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-13 11:51:37 +02:00
Michael Niedermayer
53102fa2f0 Revert "avfilter/vf_noise: dont corrupt the picture outside width x height" 
This reverts commit 51dab60c7b.

this fixed nothing, and was just the result of assuming that the
variable named linesize was the linesize. Its not, its the width
in bytes which was already correct.

Found-by: durandal_1707
 2013-09-13 11:51:37 +02:00
Georg Martius
ad96482d67 avfilter/vidstabtransform: allow negative zoom. 
This is useful in addition to crop=black.

Signed-off-by: Clément Bœsch <clement@stupeflix.com>
 2013-09-13 11:46:44 +02:00
Michael Niedermayer
51dab60c7b avfilter/vf_noise: dont corrupt the picture outside width x height 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 17:14:54 +02:00
Paul B Mahol
3eba83daed avfilter/vf_noise: unbreak filter when inline assembly is not present 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-12 14:54:10 +00:00
Paul B Mahol
b211607b5c avfilter: various cosmetics 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-12 14:01:43 +00:00
Paul B Mahol
a8e00cf926 avfilter: remove redundant use of AV_NE() macro 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-11 15:05:21 +00:00
Paul B Mahol
99a283331c avfilter/vf_traspose: move switch out of loop 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-11 15:02:08 +00:00
Paul B Mahol
bf5ceeffc3 avfilter/vf_psnr: >8 bit planar support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-10 16:45:48 +00:00
Michael Niedermayer
bb23bf8fd7 avfilter/avfilter: fix null pointer dereference with queued ping filters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 13:39:57 +02:00
Paul B Mahol
0227b42926 avfilter/vf_psnr: refactor subsampled format support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-08 12:01:44 +00:00
Paul B Mahol
ffde17e70f avfilter/vf_histeq: remove unused item from filter private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-07 21:04:12 +00:00
Paul B Mahol
4cf1900ba7 avfilter/vf_format: add .get_video_buffer back 
Unbreak xyz12 with vflip.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-07 20:37:48 +00:00
Paul B Mahol
d2382903d6 avfilter/vf_rotate: fix 'oh' option description 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-07 18:35:26 +00:00
Paul B Mahol
b077d8d908 avfilter: remove redundant .get_(audio/video)_buffer initializations 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-07 18:20:16 +00:00
Paul B Mahol
5a16a1d508 avfilter/af_asetnsamples: remove .needs_writable as it is not required 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-07 12:15:46 +00:00
Michael Niedermayer
64c54f8333 avfilter/af_compand: silence "maybe uninitialized" warnings 
if channels is 0 it actually would be uninitialized, thus an assert with comment is added

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-07 03:49:01 +02:00
Michael Niedermayer
797762fcf3 avfilter/af_aecho: silence "maybe uninitialized warning" 
if channels is 0 it actually would be uninitialized, thus an assert with comment is added

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-07 03:48:07 +02:00
Paul B Mahol
50b90d5e0b lavfi/telecine: remove bitstream and pal formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 18:45:27 +00:00
Paul B Mahol
6770fa4df8 lavfi/fieldorder: work with non writtable frames too 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 18:34:37 +00:00
Paul B Mahol
33dacda40b lavfi/fieldorder: remove pal8 format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 18:34:37 +00:00
Paul B Mahol
86cb986ce1 lavfi/fieldorder: add timeline support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 17:45:31 +00:00
Paul B Mahol
df7e3572c3 lavfi/fieldorder: use av_image_fill_linesizes() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 17:45:31 +00:00
Paul B Mahol
9b35bee696 lavfi/fieldorder: remove redundant get_video_buffer() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 17:45:31 +00:00
Paul B Mahol
898c6191ff lavfi: Weston 3 Field Deinterlacing Filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 12:46:56 +00:00
Paul B Mahol
d2e237338d lavfi/mp: remove mp=fil 
The filter does not work correctly most of time.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-05 20:22:47 +00:00
Paul B Mahol
0a8bb91505 lavfi/mp: remove mp=dint 
There are better and actually maintained filters that have similar
functionality.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-05 20:03:36 +00:00
Michael Niedermayer
59b9ecc92a avfilter/vf_yadif: Treat mode as a field of flags 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-05 20:53:12 +02:00
Michael Niedermayer
4ff5b2683c avfilter/vf_yadif: fix "incompatible pointer type" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-05 19:58:45 +02:00