Michael Niedermayer
0b3bd78714
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/buffersrc: fix failed requests count.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 21:32:13 +02:00
Michael Niedermayer
3220083c11
ra144: Try to fix int16/uint16 warnings from pgc
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 21:31:11 +02:00
Michael Niedermayer
cc6f848dba
avutil/intfloat_readwrite: avoid comparission with INFINITY, use isinf()
...
Should fix pgc warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 21:25:41 +02:00
Michael Niedermayer
45741dd81f
vf_lut: fix simplification / off by 1 error
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 21:25:41 +02:00
Paul B Mahol
1de7dcb457
lavfi/stereo3d: fix interleave row output modes
...
Linesizes that did not match output width produced several artifacts.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-17 17:34:17 +00:00
Clément Bœsch
7ee2daed9b
lavfi/interlace: remove exec permissions.
2013-04-17 19:27:33 +02:00
Clément Bœsch
4c6fa4ef45
lavfi/lut: simplify nested component stepping.
2013-04-17 19:18:08 +02:00
Clément Bœsch
45f5bf917b
lavfi/lut: reindent after previous commit.
2013-04-17 19:18:08 +02:00
Clément Bœsch
3db3b278f2
lavfi/lut: add direct path.
2013-04-17 19:18:08 +02:00
Michael Niedermayer
7f2253078d
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
indeo3: check motion vectors.
Conflicts:
libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 17:30:07 +02:00
Paul B Mahol
716588188d
lavfi/stereo3d: check input width & height
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-17 15:16:48 +00:00
Michael Niedermayer
2787f7b188
Merge commit '34e6af9e204ca6bb18d8cf8ec68fe19b0e083e95'
...
* commit '34e6af9e204ca6bb18d8cf8ec68fe19b0e083e95':
indeo3: fix data size check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 16:57:45 +02:00
Michael Niedermayer
4029a5ebc2
Merge commit '66531d634e75b834e89e4a6a0f7470ca018712a1'
...
* commit '66531d634e75b834e89e4a6a0f7470ca018712a1':
indeo3: switch parsing the header to bytestream2
Conflicts:
libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 16:50:34 +02:00
Michael Niedermayer
e5dc5095f9
Merge commit '01d376f598fe95478036f5d1e3e5e14ffe32d4bf'
...
* commit '01d376f598fe95478036f5d1e3e5e14ffe32d4bf':
rv10: check that extradata is large enough
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 16:20:49 +02:00
Michael Niedermayer
4916e220a6
Merge commit 'bac8d38c0a716c8bdfdecf0ae545015c68f5df36'
...
* commit 'bac8d38c0a716c8bdfdecf0ae545015c68f5df36':
rv10: return meaningful error codes.
Conflicts:
libavcodec/rv10.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 16:10:23 +02:00
Michael Niedermayer
8cff853b23
Merge commit '69f6f03cd16a09e4e848b4e82bae4993bc361cd0'
...
* commit '69f6f03cd16a09e4e848b4e82bae4993bc361cd0':
rv10: cosmetics, reformat
qdm2: check that the FFT size is a power of 2
Conflicts:
libavcodec/rv10.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 16:04:38 +02:00
Michael Niedermayer
0a946599f8
Merge commit 'ecff5acb5a738fcb4f9e206a12070dac4bf259b3'
...
* commit 'ecff5acb5a738fcb4f9e206a12070dac4bf259b3':
svq1dec: clip motion vectors to the frame size.
Conflicts:
libavcodec/svq1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 15:52:10 +02:00
Michael Niedermayer
251f283b9d
Merge commit 'b1bb8fb860b47e90dd67f0c5740698128fc82dcc'
...
* commit 'b1bb8fb860b47e90dd67f0c5740698128fc82dcc':
svq1dec: check that the reference frame has the same dimensions as the current one
Conflicts:
libavcodec/svq1dec.c
See: 3b57bb478f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 15:40:47 +02:00
Michael Niedermayer
f60ba6c524
Merge commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347'
...
* commit 'c0771a1ac6da697f86e3b10c8fe5dbc2ee92e347':
af_channelmap: cosmetics, use an extra local variable to shorten the code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 15:13:14 +02:00
Michael Niedermayer
74e86d3147
Merge commit 'aafed1175df76603e94c99a7748968780d6548d2'
...
* commit 'aafed1175df76603e94c99a7748968780d6548d2':
af_channelmap: sanity check input channel indices in all cases.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 15:04:22 +02:00
Paul B Mahol
b725202546
lavfi/stereo3d: fix output width for sbsl/sbs2l
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-17 12:21:47 +00:00
Paul B Mahol
f0a149e538
lavfi: remove bad inverse telecine filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-17 11:51:16 +00:00
Anton Khirnov
a0a872d073
indeo3: check motion vectors.
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
2013-04-17 12:10:42 +02:00
Anton Khirnov
34e6af9e20
indeo3: fix data size check
...
The data offsets are relative to the bistream header, which is 16 bytes
after the start of the data.
Fixes invalid reads with corrupted files.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
2013-04-17 12:09:36 +02:00
Anton Khirnov
66531d634e
indeo3: switch parsing the header to bytestream2
...
Also add an additional sanity check to the alt_quant table.
Fixes invalid reads with corrupted files.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
2013-04-17 12:08:49 +02:00
Clément Bœsch
a5ebd2d987
cmdutils: slightly better -filters output.
2013-04-17 11:57:37 +02:00
Nicolas George
e3e6aa7afb
lavfi/buffersrc: fix failed requests count.
...
The line was lost during the AVFrame transition.
It causes programs relying on the failed requests count,
especially ffmpeg, to add frames to the wrong input.
Fix trac ticket #2467 .
2013-04-17 11:32:03 +02:00
Pavel Koshevoy
e5644313c5
examples/filtering_audio: get rid of AVABufferSinkParams
...
AVABufferSinkParams are ignored by avfilter_graph_create_filter,
therefore the example is misleading. Use av_opt_set_int_list to
configure abuffersink directly.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 11:11:57 +02:00
Michael Niedermayer
f2619cbd61
examples/filtering_audio: enable ref counted frames
...
Fixes accessing freed memory
Signe-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 11:11:57 +02:00
Clément Bœsch
9db6aaeb2c
ffplay: use format title metadata to set window caption.
2013-04-17 11:08:49 +02:00
Anton Khirnov
01d376f598
rv10: check that extradata is large enough
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
2013-04-17 11:01:52 +02:00
Anton Khirnov
bac8d38c0a
rv10: return meaningful error codes.
...
Also improve some error messages.
2013-04-17 11:01:17 +02:00
Anton Khirnov
69f6f03cd1
rv10: cosmetics, reformat
2013-04-17 10:58:29 +02:00
Anton Khirnov
34f87a5853
qdm2: check that the FFT size is a power of 2
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
2013-04-17 10:56:11 +02:00
Anton Khirnov
ecff5acb5a
svq1dec: clip motion vectors to the frame size.
...
Fixes invalid reads for corrupted files.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
2013-04-17 10:55:51 +02:00
Anton Khirnov
b1bb8fb860
svq1dec: check that the reference frame has the same dimensions as the current one
...
They can be different if the last keyframe failed to decode correctly.
Fixes possible invalid reads in such a case.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
2013-04-17 10:55:30 +02:00
Anton Khirnov
c0771a1ac6
af_channelmap: cosmetics, use an extra local variable to shorten the code
2013-04-17 08:37:59 +02:00
Anton Khirnov
aafed1175d
af_channelmap: sanity check input channel indices in all cases.
...
Fixes invalid reads from non-existing channels.
CC:libav-stable@libav.org
2013-04-17 08:37:59 +02:00
Paul B Mahol
b8edf91657
lavfi/histeq: fix out of array write
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-17 00:24:16 +00:00
Michael Niedermayer
161dee4321
rmdec: dont return uninitialized data
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 02:16:58 +02:00
Carl Eugen Hoyos
fe1de12faf
Remove two anonymous arrays.
...
Fixes compilation of pngenc.c and flvdec.c with PGC 13.4-0.
2013-04-17 00:37:05 +02:00
Carl Eugen Hoyos
9802f56684
ass_split: Do not use the function name as a parameter name in a declaration.
...
Fixes compilation of srtenc.o with PGC 13.4-0.
2013-04-17 00:35:00 +02:00
Michael Niedermayer
92218aad00
butterflies_float: replace 2 lea by 2 add
...
adds are simpler instructions and should be faster or equally fast
on all cpus
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 00:10:06 +02:00
Christophe Gisquet
1a4007964c
x86: float dsp: butterflies_float SSE
...
97c -> 49c
Some codecs could benefit from more unrolling, but AAC doesn't.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-17 00:03:25 +02:00
Paul B Mahol
295ce83e2f
lavfi/il: remove pointless store
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-16 21:45:34 +00:00
Paul B Mahol
9bd1b1c1e7
lavfi/earwax: remove pointless store
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-16 21:32:26 +00:00
Michael Niedermayer
0ea97a1c5b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
cmdutils: Fix build with lavfi disabled
flvenc: do not mux more than one stream per type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16 23:23:16 +02:00
Paul B Mahol
c1fe41ed47
libaacpluc: remove unused code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-16 21:13:51 +00:00
Paul B Mahol
83253431b7
lavfi/stereo3d: remove pointless store
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-16 21:07:21 +00:00
Paul B Mahol
9429408cc1
sgirledec: remove unused headers
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-16 20:46:45 +00:00