Michael Niedermayer
05bea44393
Merge commit '5941978e71d2c3a8e2a7e87951e081e0b2e77da9'
...
* commit '5941978e71d2c3a8e2a7e87951e081e0b2e77da9':
vp3: bfin: Transpose the IDCTs
Conflicts:
libavcodec/bfin/vp3_bfin.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16 00:50:33 +02:00
Michael Niedermayer
d5c31403aa
Merge commit 'c46819f2299c73cd1bfa8ef04d08b0153a5699d3'
...
* commit 'c46819f2299c73cd1bfa8ef04d08b0153a5699d3':
x86: Move constants to the only place where they are used
Conflicts:
libavcodec/x86/vp3dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16 00:44:20 +02:00
Michael Niedermayer
398b9ed28f
Merge commit 'c0dcf89887f7fbdd7a8502bc7c715f50157562cb'
...
* commit 'c0dcf89887f7fbdd7a8502bc7c715f50157562cb':
bfin: Match DEFUN_END macros to the right functions
Conflicts:
libavcodec/bfin/pixels_bfin.S
This bug seems not to have existed in our bfin code, thus
no change in this merge
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16 00:40:57 +02:00
Stefano Sabatini
41985cb0ab
doc/filters: merge asplit and split documentation
...
Also move them to multimedia filters section.
2013-04-15 23:40:05 +02: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
3950236332
sws/x86: update RENAME(rgb24toyv12)() to using the user provided rgb2yuv table
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 21:44:50 +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
Clément Bœsch
34186832de
doc/filters: add a curves example with psfile.
2013-04-15 21:18:17 +02:00
Michael Niedermayer
6e29f39252
swr/rematrix: use av_calloc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 20:31:06 +02:00
Michael Niedermayer
8a11114a79
pca: use av_calloc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 20:31:06 +02:00
Michael Niedermayer
003d497d31
pca: use sizeof(variable) instead of sizeos(TYPE)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 20:31:06 +02:00
Paul B Mahol
a4f03f082b
FATE: add a test for the histogram filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-15 16:40:26 +00:00
Paul B Mahol
9e6dd24fa1
doc/filters: move aphaser to right(audio) chapter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-15 16:23:08 +00: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
Michael Niedermayer
1557f34b10
dfa: support decoding version=1.0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 12:13:41 +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
Martin Storsjö
5941978e71
vp3: bfin: Transpose the IDCTs
...
While this change isn't bitexact, the IDCTs weren't bitexact to
start with either.
This simplifies decoupling vp3 from dsputil.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-15 12:31:52 +03:00
Ronald S. Bultje
c46819f229
x86: Move constants to the only place where they are used
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-15 12:17:39 +03:00
Martin Storsjö
c0dcf89887
bfin: Match DEFUN_END macros to the right functions
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-15 12:13:26 +03:00
Michael Niedermayer
357da7ed42
sws: remove forgotten FAST_BGR2YV12 define
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 11:04:52 +02:00
Reimar Döffinger
c10d498bfd
Add thread-safe wrapper for get_format().
...
Just like get_buffer, get_format should not be called from a different
thread if thread_safe_callbacks is not set.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-04-15 09:04:07 +02:00
Reimar Döffinger
8067f55edf
Fix compilation on ARM with android gcc 4.7
...
With the current code it fails due to running out
of registers.
So code the store offsets manually into the assembler
instead.
Passes "make fate-dts".
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-04-15 09:04:07 +02:00
Michael Niedermayer
920dd84bf1
sws/x86: remove 8bit rgb2yuv coefficient case for rgb24toyv12 special converter
...
This simplifies the code and improves quality at the expense of a slight
slowdown of a rarely used function (no fate test uses it).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 03:19:52 +02:00
Michael Niedermayer
a37fd7f957
sws: Update rgb24toyv12_c() to user supplied rgb2yuv tables
...
As the function arguments change, we also change the function name
to ensure that anyone using this (non public) function doesnt end
with hard to debug crashes. The new name also has a proper prefix.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 03:08:37 +02:00
Michael Niedermayer
8e27c6ebbb
sws/"rgb2rgb": drop RGB2YUV_SHIFT
...
Fixes a warning and increases the precission the coefficients
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 02:27:14 +02:00
Michael Niedermayer
2a5d1cb2d9
sws/x86: update rgba->yuv to use user supplied table
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 01:31:01 +02:00
Michael Niedermayer
17ad06c753
sws/x86: update rgb/bgr->yuv code to use provided coefficient table
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 01:31:01 +02:00
Michael Niedermayer
9aafb95ae2
sws: init input_rgb2yuv_table depending on yuv colorspace
...
For the default table we keep using the exact previous
coefficients, this way individual functions can be updated seperately
without breaking fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 01:30:15 +02:00
Michael Niedermayer
3662e49dde
sws: move RGB2YUV_SHIFT to swscale_internal.h
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15 01:23:29 +02:00
Clément Bœsch
e66a10689b
lavf/libquvi: fix error reporting.
2013-04-15 01:18:11 +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
8de9bb6e5e
lavf: remove some flushing in write_packet muxers callbacks.
...
Since 4f112a8e3
, this is not necessary anymore. Also, it allows to
actually disable the flushing.
2013-04-14 21:16:53 +02:00
Stefano Sabatini
bc1847addf
doc/filters: remove mention to telecine mp filter
...
It was removed in 32a7b858c9
.
2013-04-14 21:11:31 +02:00
Clément Bœsch
dfac37afd2
lavfi: add missing periods in filter descriptions.
2013-04-14 20:58:31 +02:00
Stefano Sabatini
f6c9a325b7
ffmpeg: show error message in case of av_buffersrc_add_frame_flags() failure
2013-04-14 20:30:37 +02:00
Stefano Sabatini
fba3a3bbfb
doc: document -opencl_options option in ff* tools manuals
2013-04-14 20:30:34 +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
Michael Niedermayer
d4956b0bfb
sws/input: replace hardcoded rgb2yuv coefficients by table
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-14 20:04:55 +02:00
Michael Niedermayer
41ebb64511
swscale/output: fix alpha scale in the new functions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-14 16:57:09 +02:00
Michael Niedermayer
a4b5e45e2b
sws/output: add yuv2rgb_full_1_c_template()
...
7500->4500 cycles on sandybridge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-14 16:57:09 +02:00
Clément Bœsch
458d956b09
doc/filters: move mpdecimate doc to a more appropriate position.
2013-04-14 15:59:37 +02:00
Clément Bœsch
7a92ec93c6
lavfi: port IVTC filters from vapoursynth.
2013-04-14 15:59:37 +02:00