virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
57,493 Commits 37 Branches 400 Tags 463 MiB
758b6d39f6
Commit Graph

4027 Commits

Author SHA1 Message Date
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
Paul B Mahol
b24530019f lavfi/blend: timeline support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-14 17:41:50 +00:00
Paul B Mahol
811b17fbad lavfi: cosmetics: fix vertical alignment for pads in some filters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-14 15:31:56 +00:00
Michael Niedermayer
6b13f54262 vf_colorchannelmixer: round lut entries to nearest 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 12:51:22 +02:00
James Darnley
d10499a32a yadif: correct strides in filter_edges_16bit 
The C code treats the data as arrays of uint16_t so strides must not
be in bytes but in pixels.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-05-14 09:24:13 +02:00
James Darnley
b0ef0ae776 yadif: restore speed of the C filtering code 
Always use the special filter for the first and last 3 columns (only).

Changes made in 64ed397 slowed the filter to just under 3/4 of what it
was.  This commit restores the speed while maintaining identical output.

For reference, on my Athlon64:
1733222 decicycles in old
2358563 decicycles in new
1727558 decicycles in this

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-05-14 09:23:55 +02:00
Andrey Utkin
47a628bfb3 avfilter: Add 'drawgrid' video filter 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 21:34:15 +02:00
Clément Bœsch
0122300c86 lavfi/hqdn3d: restore timeline feature. 2013-05-12 13:07:47 +02:00
Clément Bœsch
0652111833 lavfi/hqdn3d: use macros instead of hardcoded indexes. 2013-05-12 13:07:47 +02:00
Clément Bœsch
1776177b7f lavfi: replace passthrough_filter_frame with a flag. 
With the introduction of AVFilterContext->is_disabled, we can simplify
the custom passthrough mode in filters.

This commit is technically a small compat break, but the timeline was
introduced very recently.

Doxy by Stefano Sabatini.
 2013-05-12 13:07:47 +02:00
Clément Bœsch
60f0e30431 lavfi/vflip: use FF_CEIL_RSHIFT for chroma w/h rounding. 2013-05-12 12:59:00 +02:00
Clément Bœsch
59d33eafd1 lavfi/lut: use FF_CEIL_RSHIFT for chroma w/h rounding. 2013-05-12 12:59:00 +02:00
Paul B Mahol
91cae60ecb lavfi/select: unbreak compatibility with older PICT_TYPE syntax 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-12 10:52:26 +00:00
Michael Niedermayer
44f69c0df8 avfilter/af_astats: fix 64bit printf type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-11 19:10:39 +02:00
Michael Niedermayer
bb0d3a4393 avfilter/vf_mp: remove unused function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-11 19:08:42 +02:00
Michael Niedermayer
efaa2e01e6 vf_copy: silence "incompatible pointer type" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-11 15:51:27 +02:00
Clément Bœsch
a9705e4de9 lavfi/curves: avoid ctx pointer indirection. 2013-05-10 23:47:28 +02:00
Michael Niedermayer
2a7d719848 Merge commit '16a4a18db089af8c432f1cdec62155000585b72c' 
* commit '16a4a18db089af8c432f1cdec62155000585b72c':
  af_asyncts: fix offset calculation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-10 23:03:50 +02:00
Paul B Mahol
4868855b13 lavfi/select: set forgotten VAR_PICT_TYPE_BI 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-10 17:39:09 +00:00
Paul B Mahol
005ee7a586 lavfi: avectorscope filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-10 17:11:54 +00:00
Clément Bœsch
50e66726a2 lavfi: use ceil right shift for chroma width/height. 
This should fix several issues with odd dimensions inputs.

lut, vflip, pad and crop video filters also need to be checked for such
issues. It's possible sws is also affected.
 2013-05-10 17:20:06 +02:00
Paul B Mahol
d751a2526f lavfi/anull: remove redundant lines 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-10 15:08:12 +00:00
highgod0401
63e8fc4d8f lavfi: modify names of deshake_kernel.h and unsharp_kernel.h 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-10 12:44:04 +02:00
Stefano Sabatini
5c4c929878 lavfi/avfiltergraph: fix style 2013-05-10 10:33:00 +02:00
Stefano Sabatini
e1332ff324 lavfi/avfilter.h: fix typo 2013-05-10 10:33:00 +02:00
Anton Khirnov
16a4a18db0 af_asyncts: fix offset calculation 
delta is in samples, not bytes. Also the sample format is not guaranteed
to be planar.

CC:libav-stable@libav.org
 2013-05-10 09:31:27 +02:00
Clément Bœsch
4db84bac13 lavfi/opencl: replace SHIFTUP with FF_CEIL_RSHIFT. 2013-05-09 16:59:43 +02:00
Clément Bœsch
f0250cc463 lavfi/overlay: simpler up-rounded w/h computations. 2013-05-09 16:59:43 +02:00
Clément Bœsch
570d63eef3 lavu: add FF_CEIL_RSHIFT and use it in various places. 2013-05-09 16:59:42 +02:00
Paul B Mahol
88e0e2054d lavfi: remove alphaextract special code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-09 14:53:21 +00:00
Michael Niedermayer
696f5f98e2 Merge commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e' 
* commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e':
  x86: vf_yadif: Remove stray dsputil_mmx #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-09 11:51:40 +02:00
Michael Niedermayer
e4723a82f7 avfilter: fix 2 warnings about discarding const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 23:55:06 +02:00
Michael Niedermayer
1e1015f330 avfilter/af_apad: Support AVFILTER_FLAG_SUPPORT_TIMELINE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 23:55:06 +02:00
Michael Niedermayer
df9f9caba5 avfilter: Make enabled/disabled state available as a field of the AVFilterContext 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 23:55:06 +02:00
Paul B Mahol
c4a5499d25 lavfi/extractplanes: packed rgb support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-08 19:28:30 +00:00
Paul B Mahol
8245520b88 lavfi/colorchannelmixer: remove now redudant code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-08 19:24:23 +00:00
Paul B Mahol
deef4b1ac9 lavfi/drawutils: add 16 bit rgb and planar rgb to ff_fill_rgba_map() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-08 19:24:23 +00:00
Diego Biurrun
6e9f8d6a7d x86: vf_yadif: Remove stray dsputil_mmx #include 2013-05-08 18:18:23 +02:00
Paul B Mahol
8e2972274e lavfi/null: remove redudant lines 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-08 12:48:05 +00:00
Paul B Mahol
94ff68ccb3 lavfi/lut: add support for YUVA422P and YUVA444P 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-08 12:48:05 +00:00
Paul B Mahol
1f2baec7bd lavfi: add gbrap support to some filters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-08 12:48:05 +00:00
Stefano Sabatini
ae0ce99ca4 lavfi/unsharp: use verbal form in help message options 2013-05-08 01:39:12 +02:00
Nicolas George
4582e4c086 lavfi: add comments to explain the negotiation loop. 2013-05-07 18:40:51 +02:00
Nicolas George
78d16b6a51 lavfi: fix filter format negotiation loop. 
query_formats() returning EAGAIN is not considered a progress
in the format negotiation.

If the filter returns EAGAIN but did set some of its formats
lists, it could be considered a partial success and counted
as progress in the negotiation. Not counting it is not a
problem because it currently only happens in the first round,
where there will always be some progress on the other filters.
 2013-05-07 18:40:51 +02:00
Clément Bœsch
d3f7b98f87 lavfi/overlay: reindent fix. 2013-05-07 15:43:28 +02:00
Clément Bœsch
5043d8d213 lavfi/alphaextract: copy width and not linesize. 
Padding data is not supposed to be copied.
 2013-05-07 15:33:49 +02:00
Michael Niedermayer
fe5b089596 Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110' 
* commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110':
  vf_scale: add endianness conversion pixel format in query_formats

Conflicts:
	libavfilter/vf_scale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-07 11:27:44 +02:00
Janne Grunau
5f87c277bd vf_scale: add endianness conversion pixel format in query_formats 2013-05-06 21:48:15 +02:00
Michael Niedermayer
f4341c64be avfilter: add av_cold to uninit() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-06 16:55:06 +02:00
highgod0401
b02f073ad4 lavfi/deshake_opencl: use ff_opencl_set_parameter 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-06 16:30:22 +02:00
highgod0401
e215cb5e96 lavfi/unsharp_opencl: use av_opencl_errstr 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-06 12:08:22 +02:00
highgod0401
9a09a9fc43 lavfi/unsharp: fix opencl crash on 64bit linux 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-06 11:45:40 +02:00
Michael Niedermayer
a1f234be11 make the ordering of the return type and av_cold consistent 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-05 13:13:00 +02:00
Michael Niedermayer
e7f8493fd8 Merge commit '20c86571ccc71412781d4a4813e4693e0c42aec6' 
* commit '20c86571ccc71412781d4a4813e4693e0c42aec6':
  lavfi: let gcc realign the stack on public graph driving functions

Conflicts:
	libavfilter/buffersink.c
	libavfilter/buffersrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-05 12:48:25 +02:00
Michael Niedermayer
a8ff830b79 Merge commit '093804a93cc5da3f95f98265a5df116912443cec' 
* commit '093804a93cc5da3f95f98265a5df116912443cec':
  avfilter: Add av_cold attributes to init/uninit functions

Conflicts:
	libavfilter/af_ashowinfo.c
	libavfilter/af_volume.c
	libavfilter/src_movie.c
	libavfilter/vf_lut.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-05 11:42:18 +02:00
Michael Niedermayer
adaa7743f5 src_movie: fix scanf string 
Fixes out of array accesses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-05 00:56:39 +02:00
Hendrik Leppkes
20c86571cc lavfi: let gcc realign the stack on public graph driving functions 
The functions which actually drive the filter graph by pushing
frames through it need to ensure an aligned stack for SIMD functions.

This fixes a crash in YADIF filter when using a mingw build in a MSVC
application.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-04 23:40:13 +03:00
Diego Biurrun
093804a93c avfilter: Add av_cold attributes to init/uninit functions 2013-05-04 21:10:05 +02:00
Stefano Sabatini
f51aa92b0f lavfi/testsrc: add support for color interactive command 2013-05-03 18:37:54 +02:00
Paul B Mahol
ce322f4c19 extractplanes filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-03 16:30:39 +00:00
Clément Bœsch
e85ea7d387 lavfi/frei0r: fix crash when parameters are not set. 2013-05-03 17:08:33 +02:00
Paul B Mahol
a64c9afe3d lavfi/blend: merge config_input_top into config_output 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-02 12:22:18 +00:00
Paul B Mahol
990b13806d lavfi/blend: use correct way to check number of planes 
This fix crash with gray, as its marked as pseudopal,
and thus have extra plane.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-02 12:22:18 +00:00
Michael Niedermayer
1a94d7c7c8 avfilter/trim: improve rounding precission 
Note, the design is still flawed, dont expect this to be frame
accurate. float/double first needs to be removed and frames
itself trimmed instead of drop vs nodrop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 13:55:30 +02:00
Michael Niedermayer
3319679d0a Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876' 
* commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876':
  lavfi: add trim and atrim filters.

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 11:34:34 +02:00
Michael Niedermayer
1cba7fa364 Merge commit 'b472938233b98178ed6c1353c37e0dc7ab585902' 
* commit 'b472938233b98178ed6c1353c37e0dc7ab585902':
  lavfi: add an asetpts filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/f_setpts.c
	libavfilter/setpts.c
	libavfilter/version.h
	libavfilter/vf_setpts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 10:59:21 +02:00
Michael Niedermayer
0061ba044a Merge commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0' 
* commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0':
  vf_setpts: cosmetics, reformat

Conflicts:
	libavfilter/f_setpts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 10:24:45 +02:00
Michael Niedermayer
e41d3aba01 Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8' 
* commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8':
  graphparser: only print filter arguments if they are non-NULL
  af_channelmap: ensure the output channel layout is valid.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 10:16:31 +02:00
Michael Niedermayer
a1b8879714 Merge commit '949c603ed9210df0e1b8e1aa82c71b93543d8071' 
* commit '949c603ed9210df0e1b8e1aa82c71b93543d8071':
  af_channelmap: remove now unnecessary goto
  vf_split: fix description

Conflicts:
	libavfilter/split.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-01 10:11:01 +02:00
Anton Khirnov
a1e05b0487 lavfi: add trim and atrim filters. 2013-04-30 11:24:57 +02:00
Anton Khirnov
b472938233 lavfi: add an asetpts filter 2013-04-30 11:17:57 +02:00
Anton Khirnov
2548834b22 vf_setpts: cosmetics, reformat 2013-04-30 11:17:23 +02:00
Anton Khirnov
c22263d3e8 graphparser: only print filter arguments if they are non-NULL 2013-04-30 11:16:57 +02:00
Anton Khirnov
8aaab1113c af_channelmap: ensure the output channel layout is valid. 2013-04-30 11:16:37 +02:00
Anton Khirnov
949c603ed9 af_channelmap: remove now unnecessary goto 
Options are freed from the generic code now, there is no need to call
av_opt_free() from the filter.
 2013-04-30 11:16:22 +02:00
Anton Khirnov
1012155722 vf_split: fix description 
It now allows an arbitrary number of inputs, not just two.
 2013-04-30 11:16:16 +02:00
Paul B Mahol
2bdd434931 lavfi/stereo3d: add support for alternating frames input & output format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-30 09:13:36 +00:00
Clément Bœsch
d558e46469 lavfi: add two opencl headers to SKIPHEADERS. 
Fix make checkheaders.
 2013-04-30 00:34:58 +02:00
Paul B Mahol
c645659988 lavfi/showwaves: fix crash in case of negative linesize 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-29 19:28:12 +00:00
Paul B Mahol
32d4641219 lavfi/showspectrum: fix crash in case of negative linesize 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-29 19:27:15 +00:00
Michael Niedermayer
e92862e75f avfilter/vf_tinterlace: fix handling of not so even sizes 
Fixes green bottom line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-29 12:26:15 +02:00
Stefano Sabatini
0400176772 lavfi/mp: remove mp=tinterlace wrapper 
From various tests, there is no evidence that the filter is faster than
the native tinterlace, and it has several more limitations and a few
bugs.

See thread:
Subject: [FFmpeg-devel] [NOPATCH] lavfi/mp: drop tinterlace wrapper
Date: Wed, 5 Sep 2012 00:26:01 +0200
 2013-04-28 13:16:40 +02:00
Stefano Sabatini
75070d9fa0 lavfi/transpose: apply grammar consistency fixes to transpose dir option 2013-04-28 13:16:40 +02:00
Stefano Sabatini
028c73358a lavfi/transpose: reindent constants 2013-04-27 20:33:54 +02:00
Stefano Sabatini
d33c77b14a lavfi/transpose: restore validity of values in range 4-7 
They were lost in commit a4e0defa75.
 2013-04-27 20:33:48 +02:00
Paul B Mahol
cc5c155959 astats filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-27 12:40:34 +00:00
Paul B Mahol
785eb5fc57 lavfi/negate: unbreak negate alpha 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-26 23:45:24 +00:00
Clément Bœsch
039c2b7828 lavfi/hqdn3d: remove timeline flag. 
The filter stores some temporal data, which needs to be done with the
passthrough callback system when timeline is enabled. Until then,
timeline support is disabled.
 2013-04-26 21:27:02 +02:00
Paul B Mahol
6a8d05061f lavfi/stereo3d: avoid division when changing aspect ratio 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-26 10:13:50 +00:00
Paul B Mahol
42d61fd968 lavfi/afade: fix AVOptions descriptions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-26 10:04:16 +00:00
Paul B Mahol
09250e3445 lavfi/curves: add support for more rgb formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-26 09:37:28 +00:00
Paul B Mahol
1a530f9ed8 lavfi: support timeline for colorbalance and colorchannelmixer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-26 09:37:28 +00:00
highgod0401
cd134963e8 lavfi/unsharp: add opencl unsharp filter 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-26 03:05:26 +02:00
Paul B Mahol
89b5ed5f15 lavfi/noise: remove get_video_buffer, its redundant now 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-25 17:05:42 +00:00
Paul B Mahol
e86ed98f43 lavfi/noise: add missing emms_c() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-25 17:01:40 +00:00
Paul B Mahol
00acfdd926 lavfi/telecine: show time base change too 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-25 16:52:29 +00:00
Clément Bœsch
035a3792c2 lavfi/subtitles: zero-init AVSubtitle. 
This avoids invalid free when the stream id doesn't match the packet
stream index.

Ticket #2501
 2013-04-25 00:56:38 +02:00
Clément Bœsch
73050df240 lavfi: add timeline support in {de,remove}logo. 
Both don't change anything in the context between frames.
 2013-04-24 20:13:01 +02:00
Clément Bœsch
1f6aa7de3e lavfi: add vidstabutils.h to SKIPHEADERS. 
Fix checkheaders when vid.stab is not available.
 2013-04-24 19:38:06 +02:00
Clément Bœsch
c7d2a3abf0 lavfi/vidstabdetect: fix direct path. 
The frame must be writable if the show option is set, otherwise pass the
frame unchanged.
 2013-04-24 18:30:43 +02:00
Clément Bœsch
c82f6e58da lavfi/vidstab: remove mention of defaults for consistency with other filters. 2013-04-24 18:30:43 +02:00
Clément Bœsch
111ac10b60 lavfi/vidstab: make use of direct variable. 2013-04-24 18:30:42 +02:00
Clément Bœsch
9273cc8eb5 lavfi/vidstab: add missing flags for 2 options. 2013-04-24 18:30:42 +02:00
Clément Bœsch
cdc48775aa lavfi/vidstab: consistent descriptions. 2013-04-24 18:30:42 +02:00
Clément Bœsch
017051266b lavfi/vidstab: miscelenaous cosmetics and typo fixes. 2013-04-24 18:30:42 +02:00
Georg Martius
4364e1f150 lavfi: add video stabilization plugins using vid.stab library 
vidstabdetect and vidstabtransform common functions for interfacing
vid.stab are in libavfilter/vidstabutils.c

Signed-off-by: Georg Martius <martius@mis.mpg.de>
 2013-04-24 18:30:42 +02:00
Stefano Sabatini
638ffb2413 lavfi/hue: rework logic for setting commands 
In particular, fix h/H commands in case h and H are not specified as
initial parameters.
 2013-04-23 22:33:53 +02:00
Michael Niedermayer
8f04220df8 avfilter/geq: rgb support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-23 16:06:37 +02:00
Michael Niedermayer
0a73803c86 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: Move some conditional code around to avoid unused variable warnings

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavfilter/x86/vf_yadif_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-23 11:01:46 +02:00
Michael Niedermayer
a9a537b154 avfilter/drawtext: add pict_type support 
Fixes Ticket2470

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-23 03:35:28 +02:00
Clément Bœsch
15d2f26998 lavfi/overlay: support timeline through the new system. 2013-04-23 01:02:28 +02:00
Clément Bœsch
38853169ce lavfi: add 'enable' command injection to filters supporting timeline. 2013-04-23 01:02:28 +02:00
Clément Bœsch
fdd93eabfb lavfi: add timeline support. 
Flag added in a few simple filters. A bunch of other filters can likely
use the feature as well.
 2013-04-23 01:02:27 +02:00
Clément Bœsch
b8a5c76131 lavfi: add frame counter into AVFilterLink and use it in filters. 2013-04-23 01:02:27 +02:00
Diego Biurrun
c1ad70c3cb x86: Move some conditional code around to avoid unused variable warnings 2013-04-22 17:50:02 +02:00
Paul B Mahol
2f11aa141a lavfi: remove mp=down3dright 
Same funcionality is provided by stereo3d=ab[2]{l,r}:sbs[2]{l,r}.
Additional "features" are barely useful and cause crash or artifacts.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-22 11:49:13 +00:00
Michael Niedermayer
e4c0f258d3 Merge commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d' 
* commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d':
  afifo: fix request_samples on the last frame in certain cases

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-22 13:02:29 +02:00
Anton Khirnov
9bfc6e02ba afifo: fix request_samples on the last frame in certain cases 
The current code can fail to return the last frame if it contains
exactly the requested number of samples.

Fixes the join filter test, which previously did not include the last
408 samples in most cases.

CC:libav-stable@libav.org

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-22 02:29:56 +02:00
Andy Martin
4ac2da3793 lavfi/fade: Added ability to do video fade based on timestamp 2013-04-21 20:57:02 +02:00
Stefano Sabatini
3e40b85683 lavfi: add interleave filters 2013-04-21 18:24:04 +02:00
Stefano Sabatini
df766673e5 lavfi/sendcmd: drop now pointless sendcmd/asendcmd_init() wrappers 2013-04-21 17:27:32 +02:00
Stefano Sabatini
5e893df7ae lavfi/sendcmd: fix various "in in" rerepepetitions in messages 2013-04-21 17:27:25 +02:00
Nicolas George
fd7a7e11b9 lavfi/buffersink: fix possible leaks after allocation failures. 
Should fix Coverity CID 1005313, 1005314, 1005315.
 2013-04-21 16:11:36 +02:00
Nicolas George
b57c23f8c8 lavfi: add asetrate filter. 2013-04-21 15:20:50 +02:00
Pavel Koshevoy
0c77cdb491 libavfilter/af_atempo: Avoid round-off error build-up, ticket #2484 
Current method for constraining fragment position drift suffers from
round-off error build up.

Instead of calculating cumulative drift as a sum of input fragment
position corrections, it is more accurate to calculate drift as the
difference between current fragment position and the ideal position
specified by the tempo scale factor.

Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-21 10:46:52 +02:00
Pavel Koshevoy
5a2a060378 libavfilter/af_atempo: Fix uninitialized memory access 
valgrind reported uninitialized memory access which was caused by
incorrect number of samples being passed to push_samples(..)

Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-21 10:45:57 +02:00
highgod0401
fdad04e756 avfilter/deshake_kernel: fix reset value bug of deshake kernel 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-20 19:55:58 +02:00
Paul B Mahol
a56fd051ee lavfi/stereo3d: support more formats for non-anaglyph outputs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-20 17:45:54 +00:00
Clément Bœsch
380cfce2b2 lavc: add AV_CODEC_PROP_TEXT_SUB. 
CC are not marked. Also allow potential mixed types later.
 2013-04-19 13:15:54 +02:00
Paul B Mahol
b63f7b3ac7 lavfi/afade: use AV_OPT_TYPE_DURATION 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-19 00:56:55 +00:00
Michael Niedermayer
7254afdf1c Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  ffmpeg: make -aspect work with -vcodec copy.
  lavfi/vf_aspect: improve compatibility of parsing.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-19 01:02:21 +02:00
Stefano Sabatini
c6a43a7244 lavfi/mptestsrc: fix invalid access in case of negative linesize 
In particular, fix crash with:
ffplay -f lavfi mptestsrc,vflip
 2013-04-18 23:47:44 +02:00
Nicolas George
b42827ffd9 lavfi/vf_aspect: improve compatibility of parsing. 
Try to accept both the old "num:den" and the new "num/den"
syntax. Fix "aspect=2" being ignored due to a missing den.

Also remove a duplicated #include.
 2013-04-18 20:51:55 +02:00
Paul B Mahol
212960eea4 colorchannelmixer filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-18 15:31:35 +00:00
Paul B Mahol
449cdd547b colorbalance filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-18 15:30:10 +00:00
Stefano Sabatini
1efcab02b6 lavfi/aspect: apply hot fix for NUM:DEN syntax 2013-04-17 23:37:22 +02:00
Stefano Sabatini
f04ec05f0e lavfi/setdar: fix num/den swapping in log message 2013-04-17 23:37:22 +02:00
Stefano Sabatini
f212c2380a lavfi/setsar: remove spurious #if FF_API_OLD_FILTER_OPTS around init field 2013-04-17 23:37:05 +02:00
Stefano Sabatini
e252460c9b lavfi/mptestsrc: remove unused size field 2013-04-17 22:40:08 +02:00
Stefano Sabatini
db84088e99 lavfi/mptestsrc: use AV_OPT_TYPE_DURATION 
Simplify.
 2013-04-17 22:40:02 +02:00
Stefano Sabatini
bbf003e949 lavfi/mptestsrc: reindent option constants 2013-04-17 22:39:51 +02:00
Stefano Sabatini
3933963d7b lavfi/testsrc: fix style 2013-04-17 22:39:44 +02:00
Stefano Sabatini
7ab6312610 lavfi/testsrc: use int in place of unsigned 
Avoid implicit int->unsigned conversion, causing invalid access in case
of negative linesize.

Fix crash with:
ffplay -f lavfi testsrc,vflip
 2013-04-17 22:39:34 +02:00
Stefano Sabatini
5229b78371 lavfi/aspect: extend verbose feedback, show old SAR and DAR values 2013-04-17 22:39:26 +02:00
Stefano Sabatini
fe5ca6b913 lavfi/aspect: restore ratio parsing 
Allow to set a ratio as "a:b" (with proper escaping), and correctly
honour the max parameter.
 2013-04-17 22:39:20 +02:00
Stefano Sabatini
8bfd878151 lavfi/select: factorize options definition between select and aselect 2013-04-17 22:39:04 +02:00
Stefano Sabatini
dcc1b32361 lavfi/select: add support for dynamic number of outputs 2013-04-17 22:34:05 +02:00
Stefano Sabatini
565c50ac7b lavfi/select: make select_frame() return void 
Set select->select internally to the function, avoid lossy double->int
conversion causing spurious frame drop (e.g. in case the evaluation
result is positive and less than 1).
 2013-04-17 22:28:56 +02:00
Michael Niedermayer
0b3bd78714 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavfi/buffersrc: fix failed requests count.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 21:32:13 +02:00
Michael Niedermayer
45741dd81f vf_lut: fix simplification / off by 1 error 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 21:25:41 +02:00
Paul B Mahol
1de7dcb457 lavfi/stereo3d: fix interleave row output modes 
Linesizes that did not match output width produced several artifacts.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-17 17:34:17 +00:00
Clément Bœsch
7ee2daed9b lavfi/interlace: remove exec permissions. 2013-04-17 19:27:33 +02:00
Clément Bœsch
4c6fa4ef45 lavfi/lut: simplify nested component stepping. 2013-04-17 19:18:08 +02:00
Clément Bœsch
45f5bf917b lavfi/lut: reindent after previous commit. 2013-04-17 19:18:08 +02:00
Clément Bœsch
3db3b278f2 lavfi/lut: add direct path. 2013-04-17 19:18:08 +02:00
Paul B Mahol
716588188d lavfi/stereo3d: check input width & height 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-17 15:16:48 +00:00
Michael Niedermayer
f60ba6c524 Merge commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347' 
* commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347':
  af_channelmap: cosmetics, use an extra local variable to shorten the code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 15:13:14 +02:00
Michael Niedermayer
74e86d3147 Merge commit 'aafed1175df76603e94c99a7748968780d6548d2' 
* commit 'aafed1175df76603e94c99a7748968780d6548d2':
  af_channelmap: sanity check input channel indices in all cases.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-17 15:04:22 +02:00
Paul B Mahol
b725202546 lavfi/stereo3d: fix output width for sbsl/sbs2l 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-17 12:21:47 +00:00
Paul B Mahol
f0a149e538 lavfi: remove bad inverse telecine filters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-17 11:51:16 +00:00
Nicolas George
e3e6aa7afb lavfi/buffersrc: fix failed requests count. 
The line was lost during the AVFrame transition.
It causes programs relying on the failed requests count,
especially ffmpeg, to add frames to the wrong input.

Fix trac ticket #2467.
 2013-04-17 11:32:03 +02:00
Anton Khirnov
c0771a1ac6 af_channelmap: cosmetics, use an extra local variable to shorten the code 2013-04-17 08:37:59 +02:00
Anton Khirnov
aafed1175d af_channelmap: sanity check input channel indices in all cases. 
Fixes invalid reads from non-existing channels.

CC:libav-stable@libav.org
 2013-04-17 08:37:59 +02:00
Paul B Mahol
b8edf91657 lavfi/histeq: fix out of array write 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-17 00:24:16 +00:00
Paul B Mahol
295ce83e2f lavfi/il: remove pointless store 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-16 21:45:34 +00:00
Paul B Mahol
9bd1b1c1e7 lavfi/earwax: remove pointless store 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-16 21:32:26 +00:00
Paul B Mahol
83253431b7 lavfi/stereo3d: remove pointless store 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-16 21:07:21 +00:00
Stefano Sabatini
30926a1f1f lavfi/aspect: fix weird copyright notice 2013-04-16 22:15:34 +02:00
Stefano Sabatini
ba32afd70e lavfi/split: use AVFILTER_DEFINE_CLASS to define class 2013-04-16 22:15:24 +02:00
Paul B Mahol
65efa1dbd9 lavfi/interlace: remove now unused av_opt_free() call 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-16 14:32:49 +00:00
Stefano Sabatini
3453b0196f lavfi/split: fix minor documentation issues 
Use verbal form to describe "outputs" options, and mention it in the
manual.
 2013-04-15 23:35:49 +02:00
Clément Bœsch
de656ea91e lavfi/drawtext: make options array more readable. 2013-04-15 21:49:18 +02:00
Michael Niedermayer
7a2a421d73 vf_histogram: avoid floats, unbreak fate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-15 21:44:50 +02:00
Paul B Mahol
8281791d07 lavfi/histogram: remove pointless store 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-15 16:07:51 +00:00
Paul B Mahol
7770975979 lavfi/noise: remove pointless store 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-15 15:57:31 +00:00
Clément Bœsch
9ecdd76679 lavfi/curves: fix memleak after master component dition. 2013-04-15 18:04:35 +02:00
Michael Niedermayer
aba678ab9d deshake: fix off by 2 error 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-15 16:23:28 +02:00
Michael Niedermayer
3d8afb23bc vf_deshake: Fix crash with r*=64 
Replace literal numbers by named R_MAX and correct their value

Fixes half of Ticket2443

Based on patch by: João Bernardo <jbvsmo@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-15 14:28:19 +02:00
Clément Bœsch
1cb02d4fbc lavfi/curves: add support for Photoshop curves files (.acv). 2013-04-15 11:35:46 +02:00
Clément Bœsch
99dac39339 lavfi/curves: add support for master component. 2013-04-15 11:35:06 +02:00
Clément Bœsch
da1bb21c13 lavfi/aphaser: silence uninitialized variable warnings. 2013-04-15 01:12:26 +02:00
Paul B Mahol
977ee8afd6 lavfi/negate: stop calling lut_init() as that function does nothing now 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-14 22:22:16 +00:00
Paul B Mahol
6ffe911302 lavfi/testsrc: unbreak smptebars only build 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-14 21:13:39 +00:00
Clément Bœsch
dfac37afd2 lavfi: add missing periods in filter descriptions. 2013-04-14 20:58:31 +02:00
Clément Bœsch
1e3104cd3c Add avpriv_dsputil_init() and use it in lavfi where relevant. 
dsputil_init() is deprecated and not meant to be exported.
ff_dsputil_init() is internal to libavcodec and thus can not be used.
avpriv_dsputil_init() is the version shared between libraries.

This commit fixes 3 unjustified libavfilter deprecated warnings.
 2013-04-14 20:15:54 +02:00
Clément Bœsch
7a92ec93c6 lavfi: port IVTC filters from vapoursynth. 2013-04-14 15:59:37 +02:00
Clément Bœsch
ab0ad6eccf lavfi: rename decimate to mpdecimate. 
The next commit will introduce a proper decimation filter to be used
along with the field matching filter. To avoid confusion with this
filter which has currently a very limited usage (and will not work
properly with the fieldmatching filter), the new decimation filter will
take the decimate name, and this filter is renamed to mpdecimate.
 2013-04-14 15:59:37 +02:00
Clément Bœsch
f359be96ca lavfi/smptehdbars: fix priv_class pointer. 
Fix Ticket2468.
 2013-04-14 10:32:35 +02:00
Clément Bœsch
d9be6e69cf lavfi/testsrc: grammar fix in comment after 03e2ec32. 2013-04-14 03:27:48 +02:00
Paul B Mahol
03e2ec32b8 lavfi: add smptehdbars source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-14 00:25:09 +00:00
Nicolas George
6fbb21d685 lavfi/buffersink: factor checks for lists sizes. 2013-04-13 20:19:24 +02:00
Clément Bœsch
73180f5b0e lavfi: flag more dynamic i/o filters. 2013-04-13 19:43:17 +02:00
Michael Niedermayer
9b672d4017 vf_mp: mp buffers are not compatible with the reference count system 
We thus must copy each frame on the vf_mp output.

This fixes artifacts with "ffplay -threads 1 dnxhdconv.mov -vf mp=eq2=1:1"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-13 15:02:51 +02:00
Stefano Sabatini
87dd62e141 lavfi/testsrc: make use of AV_OPT_TYPE_DURATION 
Simplify.
 2013-04-13 14:09:16 +02:00
Clément Bœsch
dcea58502c lavfi: drop now unused shorthand field from AVFilter. 2013-04-13 00:45:30 +02:00
Paul B Mahol
a47288f6dc lavfi/hue: add support for more alpha formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-12 19:46:19 +00:00
Paul B Mahol
047a027d0b lavfi/hue: copy alpha plane too 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-12 18:32:46 +00:00
Clément Bœsch
72ad0d56a1 lavfi/hue: make do while (0) form meaningful. 2013-04-12 20:10:58 +02:00
Stefano Sabatini
9fa3b5b8a8 lavfi/crop: log pos in debug message 2013-04-12 19:16:28 +02:00
Stefano Sabatini
1d86fe6970 lavfi/crop: restore pos constant, and fix "t" variable misplacement in variable array 
Fix evaluation of expressions containing the t variable.
 2013-04-12 19:15:06 +02:00
Michael Niedermayer
227b4458fb vf_interlace: fix frame rate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 16:40:35 +02:00
Michael Niedermayer
ebbd4fd5f0 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  FATE: add a test for the interlace filter
  lavfi: new interlace filter

Conflicts:
	Changelog
	configure
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 16:32:33 +02:00
Michael Niedermayer
3dedcef8b8 avfilter: add missing AV_OPT_FLAG_FILTERING_PARAM 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 15:47:16 +02:00
Michael Niedermayer
1007de7033 asetpts: add AVOptions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 15:46:52 +02:00
Michael Niedermayer
292f68154b avfilter: Filter options that are used for both video and audio should have both flags 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 15:45:28 +02:00
Michael Niedermayer
9a91c67478 Merge commit 'f160c6a18a574b4c7d063e0a748037cbbd9912ee' 
* commit 'f160c6a18a574b4c7d063e0a748037cbbd9912ee':
  lavfi: do not segfault on NULL passed to avfilter_get_by_name()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 15:14:08 +02:00
Michael Niedermayer
835cc0f2e7 Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da' 
* commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da':
  lavfi: change the filter registering system to match the other libraries

Conflicts:
	cmdutils.c
	ffplay.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h

This removes the ability to put AVFilters in read only memory and having
them shareable.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 15:08:40 +02:00
Michael Niedermayer
f4db6bfeb8 Merge commit '7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa' 
* commit '7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa':
  lavfi: add a function for counting elements in AVFilterPad arrays.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 14:49:30 +02:00
Michael Niedermayer
16fc24b240 Merge commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65' 
* commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65':
  lavfi: mark filters with dynamic number of inputs or outputs with special flags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 14:30:34 +02:00
Michael Niedermayer
46de9ba598 Merge commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58' 
* commit '1ba95a9cca57b023b9b9de071a5671fc05b05e58':
  lavfi: add avfilter_init_dict() for initializing a filter with a dict.

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 14:25:27 +02:00
Clément Bœsch
6b5ec76283 lavfi: fix forgotten chunk in eb0f774d. 2013-04-12 14:08:04 +02:00
Michael Niedermayer
0acf7e268b avfilter: remove opaque passing hacks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 13:56:03 +02:00
Clément Bœsch
f16a6f667c lavfi/ocv: fix crash with no dilate arguments. 2013-04-12 13:01:17 +02:00
Clément Bœsch
490786c02e lavfi/ocv: fix crash with no filter name specified. 2013-04-12 12:44:23 +02:00
Clément Bœsch
51e71d6e11 lavfi/ocv: fix build after fd6228e65. 2013-04-12 12:37:33 +02:00
Michael Niedermayer
4a88989254 buffersink: remove shorthand 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 12:25:03 +02:00
Michael Niedermayer
f1e62af0e0 avfilter: remove mixed args hack for scale. 
Our option handling code does not need this hack.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 12:19:48 +02:00
Nicolas George
e48ded8551 lavfi/buffersink: accept parameters as options. 
Move validation from init to query_formats().
Accept the formats lists as binary options.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 12:12:51 +02:00
Michael Niedermayer
3d7d819aad avfilter/asrc_aevalsrc: fix return code, 2nd try 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 12:02:06 +02:00
Michael Niedermayer
fd6228e657 lavfi: remove now unused args parameter from AVFilter.init and init_opaque 
This is mostly automated global search and replace

The deprecated aconvert filter is disabled, if it still has users
it should be updated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 11:54:39 +02:00
Anton Khirnov
d69a4177b9 lavfi: remove now unused args parameter from AVFilter.init 
Conflicts:

	libavfilter/avfilter.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_lut.c
	libavfilter/vf_select.c
	libavfilter/vf_setpts.c
	libavfilter/vsrc_color.c
	libavfilter/vsrc_movie.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 11:54:39 +02:00
Michael Niedermayer
491d261ade avfilter/asrc_aevalsrc: check correct variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 11:54:39 +02:00
Michael Niedermayer
04924bc923 avfilter: remove old shorthand system 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 10:59:12 +02:00
Michael Niedermayer
80116b6e67 af_pan: avoid spaces before % to avoid possible issues with MSVC 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 10:52:55 +02:00
Michael Niedermayer
3c821e7550 af_pan: switch to an AVOptions-based shorthand system. 
TODO: The first argument can be seperated into its own AVOption

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 10:35:45 +02:00
Серж Нискородов
9470b541e5 af_pan: fix parsing arguments from the example in the documentation 
pan=stereo: FL < FL + 0.5*FC + 0.6*BL + 0.6*SL : FR < FR + 0.5*FC +
0.6*BR + 0.6*SR

didn't actually work ('Expected out channel name, got " FL < FL"')
 2013-04-12 10:02:01 +02:00
Michael Niedermayer
c378ba19b5 abuffer: switch to an AVOptions-based shorthand system. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 09:55:01 +02:00
Michael Niedermayer
16e5e13c7e buffersrc: switch to an AVOptions-based shorthand system. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 09:53:09 +02:00
Pavel Koshevoy
8f3c440a39 lavfi/atempo: switch to an AVOptions-based system. 
Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 09:31:33 +02:00
Michael Niedermayer
9ab796127a avfilter: Update scale to dictionary based options 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 02:34:40 +02:00
Michael Niedermayer
710b0aa801 Merge commit '48a5adab62bd2a553f5069d41fa632a0701835e5' 
* commit '48a5adab62bd2a553f5069d41fa632a0701835e5':
  lavfi: add avfilter_init_str() to replace avfilter_init_filter().

avfilter_graph_create_filter() opaque is still passed to avfilter_init_filter()
which continues to pass it to init_opaque as its still used in the buffer sinks
the sinks should be changed and the opaque passing removed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 01:31:55 +02:00
Michael Niedermayer
eb0f774d4b Merge commit '1565cbc65cbb9f95c11367314a080068895e0cf0' 
* commit '1565cbc65cbb9f95c11367314a080068895e0cf0':
  lavfi: make avfilter_free() remove the filter from its graph.

Conflicts:
	libavfilter/avfilter.c
	libavfilter/avfiltergraph.c
	libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 00:54:05 +02:00
Michael Niedermayer
4fde705396 Merge commit '111367263af41c88a44bd763ceefc11d53a7f655' 
* commit '111367263af41c88a44bd763ceefc11d53a7f655':
  lavfi: add AVFilterContext.graph.

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 00:44:18 +02:00
Michael Niedermayer
5c68e14e42 Merge commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee' 
* commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee':
  lavfi: deprecate avfilter_graph_add_filter().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 00:39:09 +02:00
Michael Niedermayer
86070b8e5a Merge commit 'bc1a985ba030e9861d24965d42792850b43a43ea' 
* commit 'bc1a985ba030e9861d24965d42792850b43a43ea':
  lavfi: replace avfilter_open() with avfilter_graph_alloc_filter().

Conflicts:
	libavfilter/avfiltergraph.c
	libavfilter/internal.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 00:31:44 +02:00
Stefano Sabatini
9da369604e lavfi/overlay: improve feedback in case of invalid expression 
Based on vf_hue.c code.
 2013-04-12 00:18:39 +02:00
Stefano Sabatini
aff6cebb41 lavfi/overlay: fix crash in case of invalid expression 2013-04-12 00:09:41 +02:00
Stefano Sabatini
ed2c827575 lavfi/overlay: add repeatlast option 2013-04-12 00:09:19 +02:00
Stefano Sabatini
a77454ec14 lavfi/overlay: reindent constants in option list 
Wanted-By: ubitux
 2013-04-12 00:07:46 +02:00
Michael Niedermayer
231fd4411f Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4' 
* commit '38f0c0781a6e099f11c0acec07f9b8be742190c4':
  lavfi: merge avfiltergraph.h into avfilter.h

Conflicts:
	doc/APIchanges
	ffmpeg_filter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.h
	libavfilter/version.h
	tools/graph2dot.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 23:50:39 +02:00
Michael Niedermayer
9f3ae7aafd Merge commit '4a37d4b3f8137a4c2bbbca043de076af966b9446' 
* commit '4a37d4b3f8137a4c2bbbca043de076af966b9446':
  lavfi: add const to the pads parameter of avfilter_pad_get_name/type
  lavfi: add const to AVFilterContext.filter.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 23:31:01 +02:00
Clément Bœsch
838d803155 lavfi/mp: switch to an AVOptions-based system. 2013-04-11 23:27:12 +02:00
Clément Bœsch
7bd014eaec lavfi/aspect: fix d2q convert in init. 
Regression since git 71ef1ec7b.
 2013-04-11 22:46:47 +02:00
Clément Bœsch
9ab221f8d8 lavfi: deprecate aconvert. 
This filter is not required anymore with aformat. Drop it at next bump.
 2013-04-11 22:13:45 +02:00
Clément Bœsch
71ef1ec7b4 lavfi/aspect: switch to an AVOptions-based system. 
This is heavily based on 2831b307 by Anton Khirnov <anton@khirnov.net>
 2013-04-11 22:05:03 +02:00
Stefano Sabatini
976e3439ed lavfi/flite: switch to AVOption-based system 2013-04-11 21:37:48 +02:00
Stefano Sabatini
160ed967f4 lavfi/hue: extend debugging message 
In particular, show h value in degrees.
 2013-04-11 21:37:43 +02:00
Stefano Sabatini
3411aba82c lavfi/hue: reindent after last commit 2013-04-11 21:37:35 +02:00
Stefano Sabatini
e4fd58f472 lavfi/hue: apply major simplifications, and switch to AVOption-based system 
This also drops support for "flat syntax" and "reinit" command.

"reinit" command is not very robust and complicates the logic more than
necessary, since requires to reset all the options in the command.

*This is a syntax break*.
 2013-04-11 21:37:19 +02:00
Vittorio Giovara
3fce136798 lavfi: new interlace filter 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-04-11 21:33:07 +02:00
Clément Bœsch
c36ab01cd2 lavfi/ebur128: remove now unused av_opt_free call. 2013-04-11 20:52:41 +02:00
Anton Khirnov
f160c6a18a lavfi: do not segfault on NULL passed to avfilter_get_by_name() 2013-04-11 20:44:35 +02:00
Anton Khirnov
fa2a34cd40 lavfi: change the filter registering system to match the other libraries 
Removes an arbitrary hardcoded limit on the number of filters.
 2013-04-11 20:44:03 +02:00
Anton Khirnov
7e8fe4be5f lavfi: add a function for counting elements in AVFilterPad arrays. 
The caller needs to know what valid indices can be passed to
avfilter_pad_get_name/type.
 2013-04-11 20:43:47 +02:00
Anton Khirnov
7cdd737ba8 lavfi: mark filters with dynamic number of inputs or outputs with special flags 
This will be useful in avtools in the following commits.
Any other caller might also want to know this information.
 2013-04-11 20:42:41 +02:00
Michael Niedermayer
4f43e9b4af avfilter/aresample: use init_dict system and set child AVOption context correctly 
Parts of this commit are based on: 4fa1f52e

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 20:40:59 +02:00
Michael Niedermayer
f6bfeef7fa avfilter: fix handing of child context options 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 20:40:30 +02:00
Anton Khirnov
1ba95a9cca lavfi: add avfilter_init_dict() for initializing a filter with a dict. 2013-04-11 20:40:20 +02:00
Anton Khirnov
48a5adab62 lavfi: add avfilter_init_str() to replace avfilter_init_filter(). 
Drop the unused opaque parameter from its signature.
 2013-04-11 20:39:13 +02:00
Anton Khirnov
1565cbc65c lavfi: make avfilter_free() remove the filter from its graph. 2013-04-11 20:38:48 +02:00
Anton Khirnov
111367263a lavfi: add AVFilterContext.graph. 
It will be useful in the following commits.
 2013-04-11 20:38:23 +02:00
Anton Khirnov
c2c9801bc9 lavfi: deprecate avfilter_graph_add_filter(). 
Since this function adds a standalone filter to a filter graph and we do
not support creating such filters, there is no reason for this function
to exist.
 2013-04-11 20:36:42 +02:00
Anton Khirnov
bc1a985ba0 lavfi: replace avfilter_open() with avfilter_graph_alloc_filter(). 
Since we do not support "standalone" filters not attached to an
AVFilterGraph, we should not have a public function to create such
filters. In addition that function is horribly named, the action it does
cannot be possibly described as "opening" a filter.
 2013-04-11 20:34:14 +02:00
Anton Khirnov
38f0c0781a lavfi: merge avfiltergraph.h into avfilter.h 
We do not support using filters without AVFilterGraph in practice
anyway, so there is no point in pretending we do.
 2013-04-11 20:33:33 +02:00
Anton Khirnov
4a37d4b3f8 lavfi: add const to the pads parameter of avfilter_pad_get_name/type 2013-04-11 20:33:23 +02:00
Anton Khirnov
91d2efa7d6 lavfi: add const to AVFilterContext.filter. 
lavfi should never modify the filter through that pointer.
 2013-04-11 20:32:39 +02:00
Clément Bœsch
c1907bd732 lavfi/removelogo: switch to an AVOptions-based system. 2013-04-11 18:49:46 +02:00
Michael Niedermayer
865e20daf3 avfilter/f_select: use AVFrame metadata accessor function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 18:33:24 +02:00
Clément Bœsch
c74b0eda34 lavfi/amerge: switch to an AVOptions-based system. 2013-04-11 18:31:01 +02:00
Clément Bœsch
23a750c994 lavfi: do not warn inappropriately with aevalsrc. 2013-04-11 18:01:12 +02:00
Clément Bœsch
64ce15b9f4 lavfi/aevalsrc: switch to an AVOptions-based system. 2013-04-11 17:28:02 +02:00
Paul B Mahol
567feaafa8 lavfi/bbox: remove unused variables and functions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-11 14:02:59 +00:00
Clément Bœsch
ad9e66a565 lavfi: add pp to the ':'-to-'|' compat layer. 2013-04-11 15:52:46 +02:00
Clément Bœsch
e2e992c077 lavfi/asetnsamples: switch to an AVOptions-based system. 2013-04-11 15:40:15 +02:00
Clément Bœsch
1c0feee059 lavfi/anullsrc: switch to an AVOptions-based system. 2013-04-11 15:21:40 +02:00
Clément Bœsch
7464b9e319 lavfi: remove bbox from the filters left to update. 
The filter doesn't take any option and thus works with the new system.
 2013-04-11 15:14:07 +02:00
Paul B Mahol
11f6174a91 lavfi/blend: support more yuv pixel formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-11 13:10:11 +00:00
Clément Bœsch
7fdebb116c lavfi/astreamsync: switch to an AVOptions-based system. 2013-04-11 15:09:25 +02:00
Clément Bœsch
2fb8ca7d2c lavfi/astreamsync: fix eval memleak. 2013-04-11 15:09:25 +02:00
Clément Bœsch
ab4afcb85b lavfi/blackdetect: switch to an AVOptions-based system. 2013-04-11 14:48:19 +02:00
Clément Bœsch
7eb1ea2ae6 lavfi/sendcmd: switch to an AVOptions-based system. 2013-04-11 14:40:02 +02:00
Clément Bœsch
389eb0a919 lavfi/testsrc: remove useless args/NULL passing. 2013-04-11 14:36:50 +02:00