Michael Niedermayer
99efd59626
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
...
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
Remove pointless #undefs of previously forbidden functions.
fate: Add dependencies for bmp, cdxl, dfa, mp3
Conflicts:
doc/examples/muxing.c
libavfilter/filtfmts.c
libavutil/des.c
libavutil/eval.c
libavutil/log.c
libavutil/parseutils.c
tests/fate/mp3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05 13:34:45 +01:00
Clément Bœsch
ab5497df15
lavfi/subtitles: 10l close codec before format.
...
Fix invalid memory accesses.
2012-12-04 23:56:02 +01:00
Anton Khirnov
cb45553f57
Remove pointless #undefs of previously forbidden functions.
2012-12-04 21:40:22 +01:00
Nicolas George
0444733b78
lavfi/drawtext: add the reload option.
2012-12-04 19:06:22 +01:00
Clément Bœsch
359cd12a43
lavfi/mp: fix invalid read with filters with no argument.
2012-12-04 03:47:16 +01:00
Clément Bœsch
ef1868351d
lavfi/removelogo: switch to ff_filter_frame.
2012-12-04 02:31:40 +01:00
Clément Bœsch
3313e46c4a
lavfi: add subtitles filter.
2012-12-04 01:49:03 +01:00
Clément Bœsch
b5eb630e21
lavfi: remove some video w/h settings after avfilter_copy_buffer_ref_props.
...
video->[wh] will be set with the same values as the input after
avfilter_copy_buffer_ref_props. These filters don't change the size of
the input so there is no need for this code.
2012-12-03 21:47:03 +01:00
Clément Bœsch
d91388367f
lavfi/gradfun: remove check for AV_PERM_PRESERVE.
...
This check does not make sense in this context, see
doc/filter_design.txt for details about the usage of such flag.
2012-12-03 20:38:29 +01:00
Stefano Sabatini
5148147b26
lavfi/bbox: switch to ff_filter_frame() API
2012-12-02 18:13:49 +01:00
Stefano Sabatini
255be0734d
lavfi/alphamerge: fix leak introduced in 217163eb
2012-12-02 18:04:57 +01:00
Nicolas George
ddd87236f0
lavfi/vf_super2xsai: fix output ref size.
2012-12-02 17:08:17 +01:00
Stefano Sabatini
bd465fdc73
lavfi/framestep: switch to ff_filter_frame API
2012-12-02 15:02:05 +01:00
Stefano Sabatini
fbc339ff41
lavfi/super2xsai: switch to ff_filter_frame() API
2012-12-02 15:01:56 +01:00
Clément Bœsch
adfd9ca3fa
lavfi/hue: move to ff_filter_frame.
2012-12-02 14:44:31 +01:00
Nicolas George
24cb1f9718
lavfi/vf_tile: forward errors.
2012-12-02 13:53:41 +01:00
Nicolas George
3b316247fb
lavfi/vf_tile: cosmetic after last commit.
2012-12-02 13:53:41 +01:00
Nicolas George
6f3d2fb18b
lavfi/vf_tile: switch to filter_frame.
...
Also add error check on buffer allocation.
2012-12-02 13:53:41 +01:00
Stefano Sabatini
3d72820722
lavfi/decimate: switch to ff_filter_frame() API
2012-12-02 12:42:29 +01:00
Stefano Sabatini
217163eb98
lavfi/alphamerge: switch to ff_filter_frame() API
2012-12-02 12:42:29 +01:00
Stefano Sabatini
83ab46a57e
lavfi/blackdetect: switch to new ff_filter_frame() API
2012-12-02 12:42:29 +01:00
Clément Bœsch
9e1914dfba
lavfi/hqdn3d: avoid use of uninitialized variable.
2012-12-02 02:53:22 +01:00
Clément Bœsch
a3554bb457
lavfi/gradfun: avoid use of uninitialized variable.
2012-12-02 02:42:07 +01:00
Clément Bœsch
f61369d762
lavfi/vsrc: switch to ff_filter_frame.
2012-12-02 00:23:45 +01:00
Stefano Sabatini
13c39e9676
lavfi/geq: add T variable and example
2012-12-01 16:05:15 +01:00
Clément Bœsch
a7eabbb20d
lavfi/concat: prefer av_asprintf() over stack allocated buffer.
2012-11-29 12:55:56 +01:00
Clément Bœsch
b99f1303ad
lavfi/concat: switch to filter_frame.
2012-11-29 12:55:56 +01:00
Clément Bœsch
ea3bad0e9e
lavfi/smartblur: switch to filter_frame.
2012-11-29 12:49:03 +01:00
Clément Bœsch
9262f13269
lavfi/show{spectrum,waves}: use ff_filter_frame().
2012-11-29 11:44:20 +01:00
Michael Niedermayer
3fd8e07265
vsrc_mandelbrot: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 05:52:31 +01:00
Clément Bœsch
9236e9f1e1
lavfi/ebur128: use ff_filter_frame() everywhere.
2012-11-29 03:48:14 +01:00
Michael Niedermayer
1eb8809a41
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_fieldorder: require write permissions
vf_fieldorder: reindent
Conflicts:
libavfilter/vf_fieldorder.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:54:50 +01:00
Michael Niedermayer
87b9dc0982
Merge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666'
...
The commit has already been split and commited, this merge is just for metadata.
What has not been merged is the removial of some start/end_frame / draw_slice
related functions that are still in use. They can be removed once they are
unused.
* commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666':
lavfi: merge start_frame/draw_slice/end_frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:51:22 +01:00
Clément Bœsch
031d644878
lavfi/ass: switch to filter_frame.
2012-11-29 02:36:34 +01:00
Anton Khirnov
9178235ffb
avfilter: mark start_frame/end_frame/draw_slice as deprecated
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:30:11 +01:00
Clément Bœsch
502ecc9cc2
lavfi/colormatrix: 10l fix forgotten buffer unref.
2012-11-29 02:21:16 +01:00
Clément Bœsch
269cd07702
lavfi/colormatrix: switch to filter_frame.
2012-11-29 02:16:33 +01:00
Anton Khirnov
88f8af26a9
vf_format: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:09:40 +01:00
Anton Khirnov
7c42814782
vf_copy: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:09:22 +01:00
Anton Khirnov
ece5decbe0
vf_null: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:09:01 +01:00
Michael Niedermayer
015c2b4066
libavfilter: default to filter_frame when neither it nor start/slice/end is set.
...
this is needed for vf_null and a few others.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:08:49 +01:00
Anton Khirnov
60e50dd960
buffersrc: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 01:55:26 +01:00
Anton Khirnov
b5ecfa1d8d
buffersink: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 01:55:26 +01:00
Clément Bœsch
5d796270c5
lavfi/thumbnail: re-use ctx instead of inlink->dst.
2012-11-29 01:43:28 +01:00
Clément Bœsch
782993d9e4
lavfi/thumbnail: use avfilter_unref_bufferp() where appropriate.
2012-11-29 01:38:08 +01:00
Clément Bœsch
24f425319d
lavfi/thumbnail: switch to filter_frame.
2012-11-29 01:34:55 +01:00
Anton Khirnov
69d4420aea
libavfilter/split: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 01:20:53 +01:00
Michael Niedermayer
94fdef818e
vf_scale: switch to filter_frame
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 01:20:53 +01:00
Clément Bœsch
3860e34b08
lavfi/sendcmd: expose the options for both filters.
2012-11-29 00:52:00 +01:00
Clément Bœsch
0b70ffa4ac
lavfi/sendcmd: add FLAGS to AVOption array.
2012-11-29 00:50:37 +01:00