Michael Niedermayer
7dc0ed80e8
Merge commit '1f3f896564501c23b44fcf605567c78ce066b539'
...
* commit '1f3f896564501c23b44fcf605567c78ce066b539':
fate: Add dependencies for Vorbis, ProRes, QTRLE, utvideo tests
fate: real: Add dependencies
fate: lossless-audio: Add dependencies
x86: h264dsp: Fix linking with yasm and optimizations disabled
Conflicts:
libavcodec/x86/h264dsp_init.c
tests/fate/lossless-audio.mak
tests/fate/real.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 13:35:56 +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
Stefano Sabatini
605f1d9865
lsws: define version in SWScaler class
...
The version number is useful to check the libavutil version against which
the library was compiled at run-time, which in turn may be useful to deal
with binary compatibility issues.
2012-11-29 10:20:21 +01:00
Stefano Sabatini
cf56c20761
doc/Makefile: rework component configuration logic
...
Only enable component manual when the corresponding library providing
the feature is enabled.
2012-11-29 10:19:52 +01:00
Stefano Sabatini
989c6a4943
doc/ffmpeg-codecs: add short description
2012-11-29 09:50:39 +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
55a5ded67e
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
ffplay: increase maximum frame duration to 1 hour for streams without TS discontinuity
ffplay: fix updating external clock after seeking
ffplay: disallow seeking before the start of the file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 03:18:35 +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
Clément Bœsch
a5b765236b
lavfi: add priv_class for some forgotten filters.
...
This allows to print the options available when using commands such as
ffmpeg -help full.
2012-11-29 00:50:37 +01:00
Clément Bœsch
8a12c96d27
lavfi/mptestsrc: add FLAGS to AVOption array.
2012-11-29 00:50:37 +01:00
Anton Khirnov
0a767ad796
vf_blackframe: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:32:08 +01:00
Anton Khirnov
8f21cfc6b3
vf_aspect: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:31:50 +01:00
Anton Khirnov
aa61728d0a
vf_cropdetect: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:15:56 +01:00
Anton Khirnov
71f82c3805
vf_crop: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:15:40 +01:00
Anton Khirnov
a42b89910b
vf_drawbox: switch to filter frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:09:53 +01:00
Anton Khirnov
267290ce3b
vflip: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:09:31 +01:00
Michael Niedermayer
8c1f98d954
Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc'
...
* commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc':
lavfi: remove vf_slicify
Conflicts:
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_slicify.c
tests/lavfi-regression.sh
tests/ref/lavfi/crop_scale_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 23:59:15 +01:00
Stefano Sabatini
5ddc072d0d
doc: add ffmpeg-bitstream-filters.texi file
2012-11-28 23:51:12 +01:00
Anton Khirnov
5f648ce43e
vf_yadif: switch to filter_frame, this filter did not support slices
...
signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 23:47:01 +01:00
Anton Khirnov
9a65b8c0a2
vf_fade: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 23:47:01 +01:00
Clément Bœsch
2d9d444051
lavfi: convert remaining input/output list compound literals to named objects.
...
This is following 568c70e79e
.
2012-11-28 23:19:20 +01:00
Anton Khirnov
bff576c779
vf_lut: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 22:39:35 +01:00
Anton Khirnov
eb7e7e82e1
vf_hflip: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 22:39:16 +01:00
Anton Khirnov
dabb993c44
f_setpts: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 22:27:51 +01:00
Anton Khirnov
bb56436cfd
f_settb: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 22:19:43 +01:00
Michael Niedermayer
eb1424b4fe
src_movie: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:58:45 +01:00
Anton Khirnov
f7f6f281dd
vsrc_testsrc: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:58:39 +01:00
Anton Khirnov
c262e8cff6
vsink_nullsink: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:49:04 +01:00