Michael Niedermayer
3cd137bfea
vf_deshake: fix strict aliassing errors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 20:00:48 +01:00
Michael Niedermayer
53228f47d6
avf_concat: init pointers to NULL for saftey and to avoid warning of uninitialized use.
...
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 18:56:33 +01:00
Michael Niedermayer
981baf742c
lavfi: replace REGISTER_BUILTIN_FILTER() by REGISTER_FILTER_UNCONDITIONAL()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 15:37:05 +01:00
Michael Niedermayer
83d4a8442c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
cosmetics: Prettyprint codec/format/filter registration files
Conflicts:
libavcodec/allcodecs.c
libavdevice/alldevices.c
libavfilter/allfilters.c
libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 14:27:38 +01:00
Michael Niedermayer
2a9443a110
Merge commit '69583bd3b1eba471366141c945030c163e073e02'
...
* commit '69583bd3b1eba471366141c945030c163e073e02':
avfilter: Refactor unconditional filter registration
build: Add rtpenc_chain extra config option
configure: Add --disable-all command line option
Conflicts:
libavfilter/allfilters.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 13:05:37 +01:00
Diego Biurrun
c73c87b412
cosmetics: Prettyprint codec/format/filter registration files
2012-12-28 19:18:13 +01:00
Diego Biurrun
69583bd3b1
avfilter: Refactor unconditional filter registration
2012-12-28 19:18:13 +01:00
Michael Niedermayer
8afe168c78
vf_divtc: dont mix av_strdup and free
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-28 17:05:19 +01:00
Michael Niedermayer
baa5d6df77
vf_detc: dont mix av_strdup & free
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-28 17:04:54 +01:00
Michael Niedermayer
458afd2a0e
vf_mp: fix 'discards const qualifier from pointer target type'
...
args are not supposed to be changed by filters even if the argument is
not marked as const.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-28 17:00:01 +01:00
Clément Bœsch
ceee4407e3
lavfi/tile: small align cosmetics.
2012-12-26 21:32:38 +01:00
Clément Bœsch
4cd724daee
lavfi/tile: remove usage of link->{cur,out}_buf.
2012-12-26 21:30:46 +01:00
Clément Bœsch
3b870f973e
lavfi/scale: remove usage of link->cur_buf.
2012-12-26 21:30:45 +01:00
Clément Bœsch
a612e86ea6
lavfi/deshake: remove usage of link->cur_buf.
2012-12-26 21:30:45 +01:00
Clément Bœsch
5673a0102a
lavfi/decimate: remove usage of link->cur_buf.
2012-12-26 21:30:45 +01:00
Clément Bœsch
33e0eb5109
lavfi/video: remove unused ff_inplace_start_frame().
2012-12-26 21:30:45 +01:00
Paul B Mahol
c46cfedf09
build: mp filter does not depend on postproc anymore
...
This fixes testprogs build target if libpostproc is disabled.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-26 19:14:07 +00:00
Michael Niedermayer
a2349dc3f0
vf_idet: fix type of stats
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-26 17:27:28 +01:00
Clément Bœsch
d155abd1fc
lavfi/idet: remove unused assert include.
2012-12-26 17:17:36 +01:00
Clément Bœsch
a7f0af1b9a
lavfi/idet: remove unecessary context assignment.
2012-12-26 17:17:36 +01:00
Clément Bœsch
43cbd4406e
lavfi/idet: support named parameters.
...
The parameters are currently not documented in doc/filters.texi, but now
they at least appear in the automatic help.
2012-12-26 17:17:36 +01:00
Clément Bœsch
915d7487d7
lavfi/idet: remove unecessary poll_frame callback.
2012-12-26 17:17:36 +01:00
Stefano Sabatini
e06c147581
lavfi/aresample: fix style
...
Improve overall consistency/improve readability.
2012-12-26 11:56:35 +01:00
Hendrik Leppkes
8b6b3632fe
vf_pp: add postproc to the library dependencys for avfilter when enabled.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-25 15:49:27 +01:00
Michael Niedermayer
bd16f0a331
avfiltergraph: put variables used in #if 0 code themselfs under #if 0
...
Fixes unused variable warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-24 22:35:27 +01:00
Michael Niedermayer
ba8e909c82
Merge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00'
...
* commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00':
hlsenc: Allocate enough space for the pattern string
lavc: Correct the description of pkt_dts
avfilter: Compile FIFO filters unconditionally
Conflicts:
libavcodec/avcodec.h
libavfilter/Makefile
libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-24 15:29:15 +01:00
Clément Bœsch
768c47ec37
lavfi: remove mp=pp filter.
...
Native pp filter is available.
postproc dependency is also dropped from mp wrapper since it was the
only filter needing that dependency.
2012-12-23 19:03:36 +01:00
Clément Bœsch
9b8de93036
lavfi: add pp filter.
...
Ported from MPlayer. Original author is A'rpi, with various
contributions from Michael Niedermayer. The original documentation was
mostly written by Diego Biurrun. See the MPlayer history for full
credits.
The filter is under GPL like the original filter, even if it differs
quite a lot. There is not much point in making it LGPL since pp is under
GPL.
2012-12-23 19:03:36 +01:00
Diego Biurrun
5af53731d9
avfilter: Compile FIFO filters unconditionally
...
Building libavfilter without that functionality makes little sense.
2012-12-23 18:57:01 +01:00
Stefano Sabatini
bde1e8bf06
lavfi/overlay: make use of av_opt_set_from_string()
...
Simplify.
2012-12-22 16:14:23 +01:00
Stefano Sabatini
5e402a5319
lavfi/overlay: switch to filter_frame API
2012-12-22 16:12:26 +01:00
Paul B Mahol
185d1f3bfc
lavfi: declare arrays that never change as static const
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-21 22:38:59 +00:00
Paul B Mahol
a8ebb77493
lavfi/swapuv: use FFSWAP
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-21 19:04:11 +00:00
Michael Niedermayer
be2c0adc96
Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'
...
* commit '69f086e0f90f23d89e5739b099a4f984fa6a7885':
build: avfilter: Remove duplicate compilation entry for vf_scale
Conflicts:
libavfilter/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 17:39:03 +01:00
Diego Biurrun
69f086e0f9
build: avfilter: Remove duplicate compilation entry for vf_scale
...
vf_scale should not be unconditionally compiled even if disabled.
2012-12-21 00:18:34 +01:00
Nicolas George
c7a1239bf9
lavfi/af_aconvert: update audio->channels.
2012-12-20 17:01:35 +01:00
Nicolas George
0146c1f0f1
lavfi: remove init and check of rate and layout.
...
The sample rate and channel layout are negotiated and set
by the filter graph system.
2012-12-20 13:03:42 +01:00
Nicolas George
5033a1af17
lavfi/buffersrc: remove init of rate and layout.
...
The sample rate and channel layout are negotiated and set
by the filter graph system, the filters must not set them.
2012-12-20 13:03:42 +01:00
Nicolas George
34de47aa35
lavfi: add an accessor for ref->audio->channels.
2012-12-20 13:03:41 +01:00
Nicolas George
238edd2fe3
lavfi: add a channels field to AVFilterLink.
...
Also: fix af_pan and af_aresample, that forgot to update
audio->channels.
2012-12-20 13:03:41 +01:00
Clément Bœsch
174c483e2e
lavfi/select: fix compilation with avcodec disabled.
2012-12-20 05:17:36 +01:00
Stefano Sabatini
022e118e3f
lavfi/setpts: enable debug logs, and improve/extend debug messages
2012-12-19 11:49:54 +01:00
Clément Bœsch
de2022c5dd
lavfi/gradfun: small align cosmetics.
2012-12-19 03:22:58 +01:00
Clément Bœsch
526e2415bd
lavfi/gradfun: support named options.
...
This breaks usage for out-of-range values.
2012-12-19 03:13:26 +01:00
Clément Bœsch
3bdd70fc66
lavfi/gradfun: reduce up limit for threshold.
...
This will prevent an overflow in the SSSE3 and MMX filter_line code:
delta is expressed as an u16 being shifted by 2 to the left. If it
overflows, having a strength not above 64 will make sure that m is set
to 0 (making the m*m*delta >> 14 expression void).
A value above 64 should not make any sense unless gradfun is used as a
blur filter.
2012-12-19 03:13:26 +01:00
Clément Bœsch
63e1fc2588
lavfi/gradfun: remove rounding to match C and SSE code.
...
There is no noticable benefit for such precision.
2012-12-19 03:13:25 +01:00
Clément Bœsch
60ba9a9a88
lavfi/gradfun: fix dithering in MMX code.
...
Current dithering only use the first 4w instead of the whole 8 random values.
2012-12-19 03:13:25 +01:00
Clément Bœsch
49de902a1e
lavfi/gradfun: fix rounding in MMX code.
...
Current code divide before increasing precision.
2012-12-19 03:13:25 +01:00
Clément Bœsch
dd8a76ab08
lavfi/gradfun: do not increment DC pointer for odd values.
...
First DC is only used once otherwise. This also makes the code
consistent with ASM versions.
2012-12-19 03:13:25 +01:00
Michael Niedermayer
9700a7a1dd
af_apad: remove unneeded av_opt_free
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 17:31:01 +01:00
Michael Niedermayer
c311431e29
apad: add whole_len and pad_len options.
...
These options allow padding to a specific length or adding a specific amount if silence.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 17:30:31 +01:00
Michael Niedermayer
c2640146e0
apad: fix apad_options formating
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 17:16:03 +01:00
Michael Niedermayer
b7e085a288
af_apad: add user setable packet_size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 17:01:33 +01:00
Michael Niedermayer
5eae7f8f35
avfilter: add apad filter
...
This filter pads an audio stream with silence
It can together with -shortest be used to extend audio streams to
the same length as video.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 16:30:08 +01:00
Stefano Sabatini
94877aad57
lavfi/crop: free x and y parsed expression objects
...
Fix leak introduced in 1e5492ffe6
.
2012-12-16 13:16:47 +01:00
Stefano Sabatini
1e5492ffe6
lavfi/crop: add support to option parsing
...
Also fix documentation accordingly.
2012-12-15 20:48:20 +01:00
Stefano Sabatini
54b0c04ae3
lavfi/overlay: clarify/fix comment, add a few empty lines to ease readability
2012-12-15 14:08:42 +01:00
Stefano Sabatini
3d1e2ada25
lavfi/overlay: remove duplicated definition of ff_null_get_video_buffer()
...
Simplify.
2012-12-15 13:51:24 +01:00
Stefano Sabatini
8f44170d30
lavfi/avfilter.h: clarify doxy for AVFilterLink.out_buf
2012-12-15 13:51:24 +01:00
Michael Niedermayer
be26232efa
Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'
...
* commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd':
ivi_common: use proper logging context in ivi_decode_blocks().
ivi_common: make some functions and tables static.
asyncts: ignore min_delta only if first_pts is set
Conflicts:
libavcodec/ivi_common.c
libavcodec/ivi_common.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:56:56 +01:00
Michael Niedermayer
a01fe55077
Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'
...
* commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f':
asyncts: merge two conditions
x86inc: fully concatenate tokens to fix macro expansion for nasm
h264: initialize frame-mt context copies properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:43:46 +01:00
Michael Niedermayer
b9d887c225
Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'
...
* commit '072be3e8969f24113d599444be4d6a0ed04a6602':
h264: set parameters from SPS whenever it changes
asyncts: cosmetics: reindent
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:17:51 +01:00
Michael Niedermayer
b6e7041f90
Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'
...
* commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e':
doc: improve documentation for the asyncts filter first_pts option
asyncts: fix the asyncts behavior when using the first_pts option
Conflicts:
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 13:58:12 +01:00
Michael Niedermayer
593f5c0f3c
Merge commit '8083332c2de9ee189f96844ff4c2d9be1844116f'
...
* commit '8083332c2de9ee189f96844ff4c2d9be1844116f':
asyncts: use clipped delta value when setting resample compensation
asyncts: fix flushing of final samples at EOF
vp6: properly fail on unsupported feature
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 13:51:20 +01:00
Justin Ruggles
c0dc57f126
asyncts: merge two conditions
2012-12-13 18:51:56 -05:00
Justin Ruggles
4e5a8878d5
asyncts: ignore min_delta only if first_pts is set
2012-12-13 18:51:56 -05:00
Justin Ruggles
8083332c2d
asyncts: use clipped delta value when setting resample compensation
...
The max_comp option is supposed to limit maximum compensation, but
currently the clipped value is not actually used.
2012-12-13 13:02:21 -05:00
Justin Ruggles
0ee440fe38
asyncts: cosmetics: reindent
2012-12-13 13:02:21 -05:00
Justin Ruggles
c143de40c3
asyncts: fix the asyncts behavior when using the first_pts option
...
Currently it will do padding, but it does not properly handle
start-of-stream trimming as documented.
2012-12-13 13:02:21 -05:00
Justin Ruggles
f266486b2e
asyncts: fix flushing of final samples at EOF
2012-12-13 13:02:21 -05:00
Michael Niedermayer
616e6ffac6
aresample: increase n_out buffer size a bit to reduce delay in some corner cases
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-13 18:17:48 +01:00
Michael Niedermayer
db6e960450
lavfi: drop ff_null_start_frame/end_frame/draw_slice.
...
The functions have become unused
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-13 03:38:16 +01:00
Stefano Sabatini
43912625e0
lavfi/select: assign NAN to ignored values
...
Also log scene value. Improve debugging.
2012-12-13 00:18:49 +01:00
Stefano Sabatini
6ba1f28008
lavfi/select: add support to options
...
Add options introspection, and improve error feedback.
2012-12-13 00:16:30 +01:00
Stefano Sabatini
c214cd18e2
lavfi/select: in select_frame(), rename picref -> ref
...
The variable is now used also for audio frames.
2012-12-13 00:12:55 +01:00
Stefano Sabatini
c51f090ff9
lavfi: mv vf_select.c -> f_select.c
...
The file now contains also an audio select implementation. Also move the
aselect/select documentation from video filters to the multimedia filters
section.
2012-12-13 00:10:43 +01:00
Stefano Sabatini
f5461face5
lavfi: add aselect audio variant of select
2012-12-13 00:10:24 +01:00
Stefano Sabatini
64c5fbd7de
lavfi/select: remove deprecated and unused poll_frame() callback
...
Simplify.
2012-12-13 00:03:50 +01:00
Michael Niedermayer
02b238186a
avfilter_get_audio_buffer_ref_from_frame: check that layout and channels match if they are set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-12 17:46:05 +01:00
Michael Niedermayer
e69e780cde
ff_copy_buffer_ref: use the channel count
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-12 14:12:47 +01:00
Michael Niedermayer
5a4eb6aa27
avfilter_get_video_buffer_ref_from_frame: check channel count
...
more than 8 channels is not supported and crashes with null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-12 14:12:47 +01:00
Clément Bœsch
9138f6da4a
lavfi/showinfo: check plane count before dereferencing.
2012-12-12 02:55:10 +01:00
Clément Bœsch
4b4f16cdc0
lavfi/fps: remove parse opt error message.
...
See cc650cf0
for more info.
2012-12-11 18:14:08 +01:00
Clément Bœsch
0e0e3db189
lavfi/fps: add shorthand.
2012-12-11 18:12:11 +01:00
Clément Bœsch
fd3cdcaf5f
lavfi: remove mp=denoise3d filter.
...
hqdn3d was meant to be a more efficient denoise3d filter, is supported
natively, and is faster on my computer thanks to the ASM optimisations.
2012-12-11 04:28:08 +01:00
Clément Bœsch
18d9398143
doxy: add ref for lavfi, lpp and lsws.
2012-12-11 02:13:43 +01:00
Michael Niedermayer
b11a889055
vf_tinterlace: default of mode switch is impossible, add assert.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-11 00:03:23 +01:00
Stefano Sabatini
642a60f1c2
lavfi/setfield: add support to named options and introspection
2012-12-08 18:26:32 +01:00
Matthieu Bouron
7f154bd54f
lavfi/setfield: switch to filter_frame API
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-12-08 17:19:17 +01:00
Matthieu Bouron
4cd40ef343
lavfi/idet: switch to filter_frame API
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-12-08 17:19:17 +01:00
Stefano Sabatini
5825e9425b
lavfi/version: remove unused dropped symbol
2012-12-08 16:04:09 +01:00
Stefano Sabatini
10db70d5e9
lavfi: drop af_volume_stefano.c in favor of af_volume_justin.c
...
Justin's version has more features but is otherwise equivalent from the
point of view of the syntax.
2012-12-08 15:40:07 +01:00
Stefano Sabatini
769546631c
lavfi/volume_justin: add support to option shorthands and introspection
2012-12-08 15:22:55 +01:00
Stefano Sabatini
402ac72bbc
lavfi/volume_justin: fix a few grammar inconsistencies in options description
2012-12-08 15:22:55 +01:00
Stefano Sabatini
35e81441fc
lavfi/sendcmd: switch to filter_frame API
2012-12-08 12:10:40 +01:00
Stefano Sabatini
3eae531de2
lavfi/swapuv: switch to filter_frame API
2012-12-08 12:10:34 +01:00
Stefano Sabatini
fe508f807a
lavfi/alphaextract: consistently prefer "cur" over "in" in filter_frame()
...
Improve consistency/readability.
2012-12-07 19:45:34 +01:00
Stefano Sabatini
0bc0d31b7b
lavfi/alphaextract: access outlink properties rather than out_buf->video
...
Avoid one dereference, simplify.
2012-12-07 19:45:27 +01:00
Stefano Sabatini
130c6497d2
lavfi/alphaextract: fix assignment of invalid size value to memcpy in case linesize < 0
...
Fix crash, for example in the command:
ffmpeg -f image2 -vcodec pgmyuv -i tests/vsynth1/%02d.pgm \
-vf "[in]format=yuv420p,split,alphamerge,split[o3][o4];
[o4]vflip,alphaextract[alpha];[o3][alpha]alphamerge[out]" \
-vcodec rawvideo -f nut md5:
2012-12-07 19:43:19 +01:00
Stefano Sabatini
c3ad91a3d7
lavfi/alphaextract: switch to filter_frame() API
2012-12-07 19:42:59 +01:00