Michael Niedermayer
68f92a70f1
Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e'
...
* commit 'dae1d507af94261bafd3b11549884e5d1eca590e':
x86: Add PAVGB macro to abstract pavgb/pavgusb instruction via cpuflags
vf_fps: add final flushed frames to the dropped frame count
rv34_parser: Adjust #if for disabling individual parsers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-16 11:44:45 +01:00
Justin Ruggles
23098bbd50
vf_fps: add final flushed frames to the dropped frame count
2013-01-15 11:26:46 -05:00
Michael Niedermayer
329675cfd7
Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de'
...
* commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de':
pcx: return meaningful error codes.
tmv: return meaningful error codes.
msrle: return meaningful error codes.
cscd: return meaningful error codes.
yadif: x86: fix build for compilers without aligned stack
lavc: introduce the convenience function init_get_bits8
lavc: check for overflow in init_get_bits
Conflicts:
libavcodec/cscd.c
libavcodec/pcx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14 14:43:32 +01:00
Daniel Kang
67360ccd51
yadif: x86: fix build for compilers without aligned stack
...
Manually load registers to avoid using 8 registers on x86_32 with
compilers that do not align the stack (e.g. MSVC).
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-01-14 09:51:52 +01:00
Michael Niedermayer
6f88d2d786
vsrc_testsrc: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14 05:05:40 +01:00
Paul B Mahol
5b9126ba84
lavfi/gradfun: support YUV440P
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-13 13:23:30 +00:00
Matthieu Bouron
f9eed5d7e6
lavfi/aevalsrc: try to honor specified duration
...
If nb_samples divide sample_rate and if nb_samples allow it, aevalsrc
should generate the exact amount of samples according to duration.
Example:
aevalsrc=0::n=480:s=48000:d=5.21 should generate 250080 samples.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-01-12 17:26:35 +01:00
Nicolas George
7e5c5fa5fc
lavfi/vf_overlay: check that filter_frame does not return EAGAIN.
...
EAGAIN is used internally in the code; it currently does not make
sense as a return code from the next filter.
Should fix CID966655.
2013-01-10 21:55:02 +01:00
Michael Niedermayer
65b8527993
Merge commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a'
...
* commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a':
idcinvideo: correctly set AVFrame defaults
yadif: Port inline assembly to yasm
au: remove unnecessary casts
au: return AVERROR codes instead of -1
Conflicts:
libavcodec/idcinvideo.c
libavfilter/x86/yadif_template.c
libavformat/au.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10 12:27:16 +01:00
André Pankratz
0287eea914
lavfi/yadif: fix shorthand/option mismatch
...
Fix trac ticket #2128 .
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-01-10 11:01:14 +01:00
Daniel Kang
899157b308
yadif: Port inline assembly to yasm
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-01-09 18:41:02 +01:00
Nicolas George
ff6b34009d
lavfi: fix use-after-free in ff_filter_frame.
...
Unlike the original ff_start_frame code, the incoming reference
may be freed before that point.
Fix CID966654.
2013-01-08 13:31:33 +01:00
Clément Bœsch
caee85bbce
lavfi/kerndeint: remove unused pixel_step.
2013-01-06 18:59:15 +01:00
Clément Bœsch
f6659e5c5e
lavfi/kerndeint: fix temp buffer linesize.
...
Also re-enable the FATE test.
2013-01-06 18:59:15 +01:00
Michael Niedermayer
e797f22efa
vf_tinterlace: fix logical/bit op mixup
...
Fixes CID966642
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 04:38:53 +01:00
Clément Bœsch
521daf1409
lavfi/kerndeint: get pix format description only once.
...
This makes the code faster.
2013-01-06 04:37:33 +01:00
Clément Bœsch
aaf59766b9
lavfi/avfilter: remove now unused {src,cur,out}_buf.
...
This was supposed to be removed in 565e4993
, but it was delayed due to
the port of the remaining filters. These buffer ref pointers are not
used anymore, thus dropped.
2013-01-06 04:14:56 +01:00
Michael Niedermayer
0ef615126f
vf_kerndeint: memset buffer to avoid use of uninitialized memory.
...
This might fix fate failures.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 02:40:44 +01:00
Michael Niedermayer
39d1875455
libavfilter/video.h: remove unused things related to the start/slice/end API
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-05 23:36:09 +01:00
Michael Niedermayer
2468827c06
internal.h: remove start/end_frame from AVFilterPad
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-05 23:36:09 +01:00
Carl Eugen Hoyos
6a9af92565
Allow remaining 32bit RGB packed pix_fmts in kerndeint filter.
...
Reviewed-by: Stefano Sabatini
2013-01-05 14:40:06 +01:00
Stefano Sabatini
860b5c0a63
lavfi/kerndeint: fix mismatch between declared pixel format and test
...
+10l.
2013-01-05 14:04:33 +01:00
Matthieu Bouron
be0a67bd65
lavfi/drawutils: fix blending computation in blend_line function
...
If width is not alligned with hsub, background component should only be
multiplied once by sub alpha component.
2013-01-05 13:08:02 +01:00
Stefano Sabatini
0140566359
lavfi: add histeq filter
...
This is a port of virtual dub's histogram equalization filter by Donald
A. Graft. Based on the work by Jérémy Tran <tran.jeremy.av@gmail.com>,
done for SOCIS 2012.
2013-01-05 10:25:32 +01:00
Stefano Sabatini
172505b8bc
lavfi: add kerndeint filter
...
This is a port of the kerndeint filter (libmpcodecs/vf_kerndeint) by
Donal A. Graft (original avisynth plugin author), and is based on the
work by Jérémy Tran <tran.jeremy.av@gmail.com> done for SOCIS 2012.
2013-01-05 10:25:32 +01:00
Matthieu Bouron
bbab9cceb9
lavfi/drawutils: fix typo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-05 05:21:44 +01:00
Stefano Sabatini
cb8d3965fd
lavfi/yadif: add support to named constants
2013-01-04 11:48:54 +01:00
Stefano Sabatini
f7dc6aa6b1
lavfi/yadif: add support to named options and options introspection
...
Also rename the "enable_auto" field to "deint", to match the name of the
option.
2013-01-04 11:48:54 +01:00
Stefano Sabatini
8674597fe5
lavfi/yadif: remove redundant NULL checks in uninit
2013-01-04 11:48:53 +01:00
Stefano Sabatini
4ea7c17932
lavfi/yadif: fail during the configuration stage in case of invalid video size
...
This is better than repeatedly failing during the filtering stage.
2013-01-04 11:48:53 +01:00
Stefano Sabatini
b52c1d0c99
lavfi/yadif: remove unused poll_frame callback
2013-01-04 11:48:53 +01:00
Clément Bœsch
491ca0e89f
Replace references to "que" with the appropriate word.
...
"que" sounds like a slang word to me. This commit renames a few
variables, fix the comments and the logging messages (sometimes along
with small other typo fixes).
2013-01-03 00:21:47 +01:00
Nicolas George
b99bef17b4
lavfi/avfiltergraph: check pick_format return code.
2013-01-02 16:56:03 +01:00
Paul B Mahol
ba1cbf40ce
lavfi/lut: use ff_fill_rgba_map()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-01 17:07:57 +00:00
Nicolas George
82541d8330
lavfi: merge all filtering code into ff_filter_frame.
2013-01-01 15:19:04 +01:00
Paul B Mahol
8e4e532bb2
lavfi/avcodec: fix typo
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-01 12:57:07 +00:00
Nicolas George
2eb2e1798e
lavfi: add avfilter_get_audio_buffer_ref_from_arrays_channels.
...
It is the same as avfilter_get_audio_buffer_ref_from_arrays
except it has a "channels" and the channel layout can be 0.
2013-01-01 02:01:28 +01:00
Nicolas George
11ab2c25b6
lavfi/avfiltergraph: print query_formats errors.
2012-12-31 18:43:04 +01:00
Michael Niedermayer
08196c785a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: suppress -fPIC in msvc builds
Drop unnecessary 'l' length modifier when printfing double values.
truemotion2: Sanitize tm2_read_header()
Conflicts:
libavcodec/truemotion2.c
libavfilter/src_movie.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-31 14:20:01 +01:00
Diego Biurrun
bcb8d9eb8f
Drop unnecessary 'l' length modifier when printfing double values.
...
%f denotes a double argument and 'l' does nothing in this case
according to the C spec.
2012-12-31 11:20:45 +01:00
Clément Bœsch
8d06e83d16
lavfi/Makefile: add missing dependencies to FFLIBS.
2012-12-31 01:40:34 +01:00
Clément Bœsch
21b6991cd5
lavfi/Makefile: make FFLIBS list consistent.
2012-12-31 01:38:31 +01:00
Nicolas George
c36302a7a4
lavfi/sink_buffer: switch to filter_frame.
2012-12-30 18:29:57 +01:00
Nicolas George
a978c04e22
lavfi/video: ensure that filter_frame is called.
...
This is a temporary workaround until all filters have been
upgraded to filter_frame and the framework can forget completely
about start_frame/draw_slice/end_frame.
2012-12-30 18:29:57 +01:00
Michael Niedermayer
b84871b8eb
vf_tinterlace: dont mix declarations and expressions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-30 16:59:52 +01:00
Michael Niedermayer
c0c0b19644
lavfi: remove some draw_slice related code that has become unneeded
...
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-30 16:58:50 +01:00
Mark Himsley
8997a0fa79
lavfi/tinterlace: add low-pass-filter for top/bottom interleave modes
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-12-30 15:19:23 +01:00
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