ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 05:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,778 Commits 36 Branches 398 Tags 544 MiB
10336ca640
Commit Graph

3808 Commits

Author SHA1 Message Date
Clément Bœsch
bfafcc4ebe lavfi/vignette: simplify dmax definition. 2013-05-30 20:41:37 +02:00
Clément Bœsch
cf6f179044 lavfi/vignette: fix scale with aspects smaller than one. 2013-05-30 20:40:39 +02:00
Clément Bœsch
4a85390d29 lavfi/vignette: make sure a sane sar is set. 2013-05-30 18:13:04 +02:00
Clément Bœsch
0ab9362fcb lavfi: add vignette filter. 2013-05-30 17:52:52 +02:00
Paul B Mahol
f8f42f4821 lavfi/noise: fix out of array access 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-29 16:54:28 +00:00
Paul B Mahol
83f9735592 lavfi/noise: support slice threading 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-29 16:13:11 +00:00
Clément Bœsch
1f1df07ce5 lavfi/drawutils: attempt to fix subsampling. 2013-05-28 19:20:27 +02:00
Dave Yeo
e615a77799 os2threads: move from lavc to compat/ 
For useage in other places besides lavc. Needed after commit
90f9a5830b

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 12:49:20 +02:00
Clément Bœsch
160ea26560 lavfi/haldclutsrc: 10l remove size options. 2013-05-27 20:53:25 +02:00
Clément Bœsch
92a2d12a71 lavfi/overlay: remove do_blend forward declaration. 2013-05-27 20:42:46 +02:00
Clément Bœsch
ae5738248a lavfi/lut3d: move lut3d init to its definition scope. 2013-05-27 20:42:46 +02:00
Clément Bœsch
158d96e3f0 lavfi: add haldclut filter. 
Fixes Ticket #2517.
 2013-05-27 20:42:28 +02:00
Clément Bœsch
4328602890 lavfi: add dual input helpers. 2013-05-27 20:32:28 +02:00
Clément Bœsch
3cec29cf59 lavfi: add haldclutsrc filter. 2013-05-27 20:32:28 +02:00
Paul B Mahol
a1873f35f8 lavfi/ocv: make use of AVFILTER_DEFINE_CLASS 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-27 11:31:52 +00:00
Paul B Mahol
229d5bfdc8 lavfi/frei0r: make use of AVFILTER_DEFINE_CLASS 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-27 11:31:52 +00:00
Paul B Mahol
beda41886e lavfi/channelmap: make use of AVFILTER_DEFINE_CLASS 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-27 11:31:52 +00:00
Paul B Mahol
6008b5abbb lavfi/format: make use of AVFILTER_DEFINE_CLASS 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-27 11:17:34 +00:00
Paul B Mahol
e457f2cf1f lavfi/setpts: make use of AVFILTER_DEFINE_CLASS 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-27 11:14:43 +00:00
Paul B Mahol
5fe5bde60a lavfi/join: make use of AVFILTER_DEFINE_CLASS 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-27 11:10:39 +00:00
Paul B Mahol
622c977437 lavfi/hqdn3d: make use of AVFILTER_DEFINE_CLASS 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-27 10:58:45 +00:00
Paul B Mahol
d349704eef lavfi/interlace: make use of AVFILTER_DEFINE_CLASS 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-27 10:00:37 +00:00
Paul B Mahol
11cdf9671f lavfi/trim: make use of AVFILTER_DEFINE_CLASS 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-27 09:55:40 +00:00
Paul B Mahol
68def27124 lavfi/interlace: remove request frame hack 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-27 09:55:40 +00:00
Paul B Mahol
ed1c83508e lavfi/trim: remove request frame hack 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-27 09:55:40 +00:00
Paul B Mahol
4f8e4b8a54 lavfi/tinterlace: remove request frame hack 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-27 09:55:40 +00:00
Paul B Mahol
c63e4e6569 lavfi/idet: remove request_frame hack 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-27 09:55:39 +00:00
Clément Bœsch
b439ece51c lavfi/dctdnoiz: move DC normalization out of loops. 
Make code slightly faster, simpler, clearer.

The filter is still slow as hell, and that change won't cause any
visible performance improvement (it still takes more than one minute to
process a single 1080p frame on a Core 2 here).
 2013-05-26 22:41:02 +02:00
Clément Bœsch
56cea3294a lavfi/lut3d: faster tetrahedral interpolation. 
Increase performance by fetching only the necessary points.

1097 → 917 decicyles.
 2013-05-26 18:48:51 +02:00
Clément Bœsch
b6ee25e300 lavfi/lut3d: restore original interpolation speed. 
Call NEXT() only once since it got slower due to the overflow condition
introduced in 91b46145.

interp_trilinear:   1462 → 1280 decicycles
interp_tetrahedral: 1188 → 1097 decicycles

Tested on a Core2, GCC 4.8.
 2013-05-26 18:48:10 +02:00
Paul B Mahol
c8e9c9275f lavfi/bbox: export bbox info to frame metadata 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-26 14:00:10 +00:00
Paul B Mahol
add8c63ce4 lavfi/bbox: timeline support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-26 14:00:09 +00:00
Paul B Mahol
7aa99a69c7 lavfi/bbox: make min_val user configurable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-26 14:00:09 +00:00
Paul B Mahol
e9c3851d60 lavfi/bbox: use inlink->frame_count 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-26 14:00:09 +00:00
Paul B Mahol
40a87a6a69 lavfi/noise: use av_image_copy_plane() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-26 10:52:57 +00:00
Michael Niedermayer
4cf7b87551 av_cpu_count: factorize "detected %d logical cores" message 
Also print the message just once

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 03:19:55 +02:00
Paul B Mahol
8caf2da320 lavfi/afade: add timeline support 
For correct precision one may need to use asetnsamples.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-25 13:20:27 +00:00
Paul B Mahol
2c2e69b3a2 lavfi/blend: support slice threading 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-24 21:41:28 +00:00
Michael Niedermayer
e0f2e0fcf0 vf_fade: remove unused function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 20:50:15 +02:00
Michael Niedermayer
0cbfbdef4a vf_fade: Support slice threaded alpha 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 20:21:40 +02:00
Michael Niedermayer
a3d62f3377 vf_fade: Fix alpha flag integration 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 20:21:40 +02:00
Paul B Mahol
af12573938 lavfi/blend: fix SW/SH calculation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-24 17:34:22 +00:00
Michael Niedermayer
bca59d7745 fade: fix slice sizes 
This more evenly distributes the load between threads

This also fixes the chroma filtering where the filter was applied twice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 17:47:02 +02:00
Michael Niedermayer
1d08e4b584 yadif: fix slice sizes 
This more evenly distributes the load between threads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 17:46:57 +02:00
Michael Niedermayer
221f902f1d avfilter/vf_yadif: fix race condition 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 17:26:20 +02:00
Paul B Mahol
036e9a0417 lavfi/blend: add yuv(j)411p 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-24 14:02:37 +00:00
Michael Niedermayer
b5be1a7e23 avfilter/vf_drawtext: Fix doxygen comment 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 15:36:54 +02:00
Michael Niedermayer
a2abd58a09 avfilter: remove av_opt_set_defaults() from process_options() 
This is already called from ff_filter_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 15:25:52 +02:00
Michael Niedermayer
558ce3e5b7 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vf_fade: support slice threading
  vf_yadif: support slice threading

Conflicts:
	libavfilter/vf_fade.c
	libavfilter/vf_yadif.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 15:24:22 +02:00
Paul B Mahol
2516b393d4 lavfi/field, il, noise: use av_pix_fmt_count_planes() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-24 12:53:23 +00:00
Michael Niedermayer
8d4e969afe Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f' 
* commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f':
  lavfi: add a slice threading infrastructure

Conflicts:
	Changelog
	cmdutils.c
	doc/APIchanges
	libavfilter/Makefile
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/internal.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 14:07:00 +02:00
Anton Khirnov
8a994b7406 vf_fade: support slice threading 2013-05-24 09:33:05 +02:00
Anton Khirnov
cb79881b49 vf_yadif: support slice threading 2013-05-24 09:32:07 +02:00
Anton Khirnov
129bb23843 lavfi: add a slice threading infrastructure 
Mostly based on libavcodec's
 2013-05-24 09:28:18 +02:00
Clément Bœsch
a0a41db339 lavfi/testsrc: make nb_decimals available only in testsrc. 2013-05-23 17:22:05 +02:00
Clément Bœsch
288f916643 lavfi/testsrc: move color options to the color scope filter definition. 2013-05-23 17:22:05 +02:00
Paul B Mahol
1f02927d28 lavfi/mp: try to pass interlaced & tff flags 
This makes mp=softpulldown actually useful.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-22 20:30:09 +00:00
Clément Bœsch
91b461459a lavfi/lut3d: avoid overread. 2013-05-22 22:12:14 +02:00
Clément Bœsch
12f51c1f9e lavfi: add lut3d filter. 
Fixes part of Ticket #2517.
 2013-05-22 18:23:43 +02:00
Clément Bœsch
39dc1bc90f lavfi/(a)showinfo: use link frame counter instead of local counter. 2013-05-21 22:29:16 +02:00
Stefano Sabatini
a8d98377b1 lavfi/geq: prefer symbolic constants 
Hopefully enhance readability.
 2013-05-21 21:15:08 +02:00
Stefano Sabatini
2210003b7f lavfi/geq: add aliases for RGB options 2013-05-21 21:15:00 +02:00
Clément Bœsch
b8a9876a8b lavfi/yadif: add timeline support. 2013-05-21 16:09:42 +02:00
Stefano Sabatini
b7be8ea92a lavfi/geq: mark timeline support 2013-05-20 01:40:07 +02:00
Stefano Sabatini
66f32a8a7f lavfi/drawgrid: fix drawgrid options after 4c205f42c8 2013-05-19 19:26:31 +02:00
Paul B Mahol
68c4633fa8 lavfi/histogram: cache log2 of max_hval 
Instead of calculating same value over and over again.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-19 14:30:42 +00:00
Michael Niedermayer
9f88db5df1 avfilter/vf_deshake: check rx 
Fixes crash on SSE2
Fixes Ticket2443

Note, its possible to restructure the code to avoid the 16pixel limitation,
and such change is welcome!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-18 18:28:59 +02:00
Michael Niedermayer
849bb62c2c Merge commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b' 
* commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b':
  prores: decode alpha plane when it's present
  avfilter: check a malloc in avfilter_link().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-18 13:41:47 +02:00
Michael Niedermayer
d56ced5fbf Merge commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081' 
* commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081':
  avfilter.c: cosmetics, reformat

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-18 13:36:49 +02:00
Michael Niedermayer
fb8dde37e4 Merge commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6' 
* commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6':
  lavfi: factorize freeing a link

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-18 13:10:57 +02:00
Michael Niedermayer
dd2eaf57b7 Merge commit '1dd35611433c224e2231ed7ae26b5b560863a3cb' 
* commit '1dd35611433c224e2231ed7ae26b5b560863a3cb':
  vf_format: do not use the AVFilterFormats internals.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-18 12:47:22 +02:00
Michael Niedermayer
4742edd50e Merge commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5' 
* commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5':
  af_aformat: cosmetics, fix indentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-18 12:22:25 +02:00
Michael Niedermayer
74cb7ef851 Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0' 
* commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0':
  lavfi: rename AVFilterFormats.format_count to nb_formats

Conflicts:
	libavfilter/avfiltergraph.c
	libavfilter/filtfmts.c
	libavfilter/formats.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-18 11:46:09 +02:00
Michael Niedermayer
0718f0cc24 Merge commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec' 
* commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec':
  lavfi doxy: add a page for lavfi.
  jpegls: check the scan offset

Conflicts:
	libavcodec/jpeglsdec.c
	libavfilter/avfilter.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-18 11:04:11 +02:00
Anton Khirnov
7e2b15c094 avfilter: check a malloc in avfilter_link(). 
Additionally change sizeof(type) into sizeof(var)
 2013-05-17 20:32:27 +02:00
Anton Khirnov
bf5b5d2b15 avfilter.c: cosmetics, reformat 2013-05-17 20:32:18 +02:00
Anton Khirnov
d79bd60405 lavfi: factorize freeing a link 2013-05-17 20:30:25 +02:00
Anton Khirnov
1dd3561143 vf_format: do not use the AVFilterFormats internals. 
Use the formats.h API instead.
 2013-05-17 20:30:17 +02:00
Anton Khirnov
c5ab6088ad af_aformat: cosmetics, fix indentation 2013-05-17 20:30:02 +02:00
Anton Khirnov
b01f6041f4 lavfi: rename AVFilterFormats.format_count to nb_formats 
This is more consistent with naming in the rest of Libav.
 2013-05-17 20:29:50 +02:00
Anton Khirnov
bc8c1cdc7b lavfi doxy: add a page for lavfi. 2013-05-17 20:26:11 +02:00
Paul B Mahol
85e8a1169c lavfi/pad: switch to AV_OPT_TYPE_COLOR 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-17 11:32:54 +00:00
Paul B Mahol
1d2ecf9609 lavfi/drawtext: switch to AV_OPT_TYPE_COLOR 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-17 11:32:54 +00:00
Paul B Mahol
83e892233c lavfi/life: switch to AV_OPT_TYPE_COLOR 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-17 11:32:54 +00:00
Paul B Mahol
05b7560d39 lavfi/color: switch to AV_OPT_TYPE_COLOR 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-17 11:32:54 +00:00
Michael Niedermayer
1e9a050bc0 Merge commit '16a645adeb758207346a4bbf66766f02734c461e' 
* commit '16a645adeb758207346a4bbf66766f02734c461e':
  vf_pixdesctest: make config_props work properly when called multiple times.
  vf_hqdn3d: make config_props work properly when called multiple times.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-17 11:41:14 +02:00
Michael Niedermayer
71fcb6072e Merge commit '3fb29588a27a711132106b924e27b53789a58dcb' 
* commit '3fb29588a27a711132106b924e27b53789a58dcb':
  vf_drawtext: don't leak the expressions.
  vf_crop: make config_props work properly when called multiple times.
  vf_setdar: make config_props work properly when called multiple times.

Conflicts:
	libavfilter/vf_aspect.c
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-17 11:29:22 +02:00
Michael Niedermayer
c7078f4907 Merge commit '4c205f42c86ccefa093c59434669af34ad14a52b' 
* commit '4c205f42c86ccefa093c59434669af34ad14a52b':
  vf_drawbox: make config_props work properly when called multiple times.
  vf_drawtext: do not reset the frame number in config_input.
  vf_fps: move initializing pts from config_props to init.

Conflicts:
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-17 11:05:18 +02:00
Michael Niedermayer
d5e5e73c52 Merge commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7' 
* commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7':
  vf_frei0r: make config_props work properly when called multiple times.
  vf_gradfun: make config_props work properly when called multiple times.
  vf_lut: make config_props work properly when called multiple times.

Conflicts:
	libavfilter/vf_lut.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-17 10:51:59 +02:00
Anton Khirnov
16a645adeb vf_pixdesctest: make config_props work properly when called multiple times. 2013-05-17 07:44:23 +02:00
Anton Khirnov
3ba35a346c vf_hqdn3d: make config_props work properly when called multiple times. 
Do not leak all the temp buffers.
 2013-05-17 07:44:12 +02:00
Anton Khirnov
3fb29588a2 vf_drawtext: don't leak the expressions. 2013-05-17 07:44:04 +02:00
Anton Khirnov
6592cd22a2 vf_crop: make config_props work properly when called multiple times. 
Do not leak the x/y expressions.
 2013-05-17 07:43:57 +02:00
Anton Khirnov
d5c66d9c56 vf_setdar: make config_props work properly when called multiple times. 
Do not overwrite the variable set through AVOptions.
 2013-05-17 07:43:44 +02:00
Anton Khirnov
4c205f42c8 vf_drawbox: make config_props work properly when called multiple times. 
Do not overwrite the variables set through AVOptions.
 2013-05-17 07:43:17 +02:00
Anton Khirnov
90d9a2a04c vf_drawtext: do not reset the frame number in config_input. 
Frame number should be incremented normally even if the link properties
change.
 2013-05-17 07:43:07 +02:00
Anton Khirnov
7727be79d1 vf_fps: move initializing pts from config_props to init. 
It should not be reinitialized if the link properties change.
 2013-05-17 07:42:55 +02:00
Anton Khirnov
d371c3c2e2 vf_frei0r: make config_props work properly when called multiple times. 
Do not leak the initialized filter instance.
 2013-05-17 07:42:46 +02:00
Anton Khirnov
87c31cfd7a vf_gradfun: make config_props work properly when called multiple times. 2013-05-17 07:42:39 +02:00
Anton Khirnov
b06848f4de vf_lut: make config_props work properly when called multiple times. 
Do not leak the expressions.
 2013-05-17 07:42:28 +02:00
Stefano Sabatini
cb0b0266e5 lavfi/drawbox: restore verbal form for drawbox options descriptions 2013-05-17 00:46:32 +02:00
Stefano Sabatini
0aa013fa8a lavfi: factorize drawgrid and drawbox code 2013-05-17 00:46:32 +02:00
Clément Bœsch
f3962c6264 lavfi/yadif: fix chroma subsampling with odd sizes. 2013-05-16 23:20:02 +02:00
Clément Bœsch
61b268eeda lavfi/idet: fix chroma subsampling with odd sizes. 2013-05-16 23:20:00 +02:00
Clément Bœsch
d94c907008 lavfi: silence a discarded const qualifier warning. 2013-05-16 18:38:10 +02:00
Michael Niedermayer
af00d68af0 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vf_pad: use the name 's' for the pointer to the private context
  vf_overlay: use the name 's' for the pointer to the private context
  vf_lut: use the name 's' for the pointer to the private context

Conflicts:
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-16 17:03:52 +02:00
Michael Niedermayer
df003cbb56 Merge commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8' 
* commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8':
  vf_libopencv: use the name 's' for the pointer to the private context
  vf_hqdn3d: use the name 's' for the pointer to the private context
  vf_hflip: use the name 's' for the pointer to the private context
  vf_gradfun: use the name 's' for the pointer to the private context

Conflicts:
	libavfilter/vf_gradfun.c
	libavfilter/vf_hflip.c
	libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-16 16:45:43 +02:00
Michael Niedermayer
e55092b12b Merge commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8' 
* commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8':
  vf_frei0r: use the name 's' for the pointer to the private context
  vf_format: use the name 's' for the pointer to the private context
  vf_fieldorder: use the name 's' for the pointer to the private context
  vf_fieldorder: cosmetics, remove an extra linebreak

Conflicts:
	libavfilter/vf_frei0r.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-16 15:21:31 +02:00
Clément Bœsch
afec02afe7 lavfi/unsharp: remove unused float.h include. 2013-05-16 13:38:26 +02:00
Clément Bœsch
faceb0af0a lavfi/unsharp: use av_image_copy_plane(). 2013-05-16 13:38:03 +02:00
Michael Niedermayer
04dd5ddeda Merge commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68' 
* commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68':
  vf_fade: use the name 's' for the pointer to the private context
  vf_drawtext: use the name 's' for the pointer to the private context
  vf_drawbox: use the name 's' for the pointer to the private context

Conflicts:
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-16 10:33:31 +02:00
Michael Niedermayer
a134f9676e Merge commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd' 
* commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd':
  vf_delogo: use the name 's' for the pointer to the private context
  vf_cropdetect: use the name 's' for the pointer to the private context
  vf_crop: cosmetics, break lines

Conflicts:
	libavfilter/vf_delogo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-16 10:14:00 +02:00
Michael Niedermayer
e77647c528 Merge commit '7f83959598b6565baa0091e5739dd9091ab7a990' 
* commit '7f83959598b6565baa0091e5739dd9091ab7a990':
  vf_crop: use the name 's' for the pointer to the private context
  vf_boxblur: use the name 's' for the pointer to the private context
  vf_blackframe: use the name 's' for the pointer to the private context

Conflicts:
	libavfilter/vf_blackframe.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_crop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-16 10:08:17 +02:00
Michael Niedermayer
efc08e00cc Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110' 
* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110':
  vf_aspect: use the name 's' for the pointer to the private context
  Remove commented-out debug #define cruft

Conflicts:
	libavcodec/4xm.c
	libavcodec/dvdsubdec.c
	libavcodec/ituh263dec.c
	libavcodec/mpeg12.c
	libavfilter/avfilter.c
	libavfilter/vf_aspect.c
	libavfilter/vf_fieldorder.c
	libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-16 09:56:43 +02:00
Anton Khirnov
3062ac4c47 vf_pad: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:36:10 +02:00
Anton Khirnov
a70519aad1 vf_overlay: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:36:04 +02:00
Anton Khirnov
8d2565c28b vf_lut: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:35:59 +02:00
Anton Khirnov
4753f802c0 vf_libopencv: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:35:53 +02:00
Anton Khirnov
56e4ce0d13 vf_hqdn3d: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:35:48 +02:00
Anton Khirnov
7af5ae2d07 vf_hflip: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:33:38 +02:00
Anton Khirnov
05fab5530b vf_gradfun: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:33:29 +02:00
Anton Khirnov
f6b6d6ac42 vf_frei0r: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:33:23 +02:00
Anton Khirnov
cbec213a90 vf_format: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:33:17 +02:00
Anton Khirnov
d64cf54b34 vf_fieldorder: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:33:07 +02:00
Anton Khirnov
9bbf6c681a vf_fieldorder: cosmetics, remove an extra linebreak 2013-05-16 07:32:49 +02:00
Anton Khirnov
c0279956b3 vf_fade: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:32:43 +02:00
Anton Khirnov
d3735f7ad6 vf_drawtext: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:32:34 +02:00
Anton Khirnov
20e2794eea vf_drawbox: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:32:27 +02:00
Anton Khirnov
ba09675f44 vf_delogo: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:31:57 +02:00
Anton Khirnov
e16e23d70e vf_cropdetect: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:31:50 +02:00
Anton Khirnov
671563d9fd vf_crop: cosmetics, break lines 2013-05-16 07:31:31 +02:00
Anton Khirnov
7f83959598 vf_crop: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:31:11 +02:00
Anton Khirnov
762df56ef9 vf_boxblur: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:30:56 +02:00
Anton Khirnov
a2a696990c vf_blackframe: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:30:41 +02:00
Anton Khirnov
b3ea76624a vf_aspect: use the name 's' for the pointer to the private context 
This is shorter and consistent across filters.
 2013-05-16 07:30:28 +02:00
Clément Bœsch
d686517ad1 lavfi/mp: remove mp=ow wrapper. 
Filter ported natively as owdenoise.
 2013-05-16 00:45:45 +02:00
Clément Bœsch
b1e84efa3d lavfi: port wavelet denoiser filter from libmpcodecs. 2013-05-16 00:45:45 +02:00
Diego Biurrun
2832ea26f3 Remove commented-out debug #define cruft 2013-05-16 00:23:30 +02:00
Paul B Mahol
c45b823bf8 lavfi/histogram: logarithmic mode for levels 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-15 12:38:39 +00:00
Michael Niedermayer
c7c71f95f8 replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 11:23:14 +02:00
Michael Niedermayer
ff4680922f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*

Conflicts:
	doc/APIchanges
	libavcodec/avpicture.c
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c
	libavcodec/imgconvert.c
	libavcodec/tiffenc.c
	libavfilter/vf_pixdesctest.c
	libavfilter/vf_scale.c
	libavutil/imgutils.c
	libavutil/pixdesc.c
	libavutil/version.h
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 11:10:09 +02:00
Michael Niedermayer
aa6454e6ca Merge commit '096696ef0dd391d9430376d1444c1a3cde9171fd' 
* commit '096696ef0dd391d9430376d1444c1a3cde9171fd':
  avfiltergraph: simplify inserting conversion filters.
  Clarify output of av_get_bits_per_pixel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 10:21:16 +02:00
Anton Khirnov
e6c4ac7b5f pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_* 2013-05-15 07:46:51 +02:00
Anton Khirnov
ffba2053ed lavfi: fix compatibility code for old vf_scale options syntax 
Currently it would incorrectly trigger on a string that contains a '='
but does not contain a ':', e.g. flags=<flags>.
 2013-05-15 07:46:04 +02:00
Anton Khirnov
096696ef0d avfiltergraph: simplify inserting conversion filters. 
There is now no need to explicitly pass 0:0 as width/height to scale,
those are the defaults.
 2013-05-15 07:45:51 +02:00
Clément Bœsch
bc1c90eabf lavfi/dctdnoiz: fix 10l typo in pr_height computation. 2013-05-15 03:19:49 +02:00
Clément Bœsch
7b43120c7c lavfi: add dctdnoiz filter. 2013-05-15 00:54:00 +02:00
Michael Niedermayer
640e524ff6 libavfilter/Makefile: unbreak make alltools 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 21:58:56 +02:00
Stefano Sabatini
2a1b7dee6d tools: add zmqsend tool, useful to test the zmq filters 2013-05-14 20:10:55 +02:00
Stefano Sabatini
7ddb0ef9af lavfi: add zmq filters 2013-05-14 20:10:44 +02:00