Laurent Aimar
b4483a531a
Check for unsupported parameters in ff_j2k_dwt_init()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-29 06:11:18 +02:00
Laurent Aimar
02660a8713
Check for out of bound reads in jpeg 2000 decoder.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-29 06:11:18 +02:00
Laurent Aimar
41b7389cad
Prevent calling init_vlc() with invalid parameters in motionpixels decoder.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-29 06:11:18 +02:00
Laurent Aimar
56ee5a9ad1
Prevent NULL dereference when the palette is missing in the xan decoder.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-29 06:11:18 +02:00
Laurent Aimar
5279141c1d
Fixed out of bound accesses in xan_unpack() of the xan decoder.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-29 06:11:18 +02:00
Michael Niedermayer
da343ff432
swr_test: dont test samples that have not been written
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-29 04:52:22 +02:00
Michael Niedermayer
f9a2d0c3fe
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (23 commits)
avconv: Reformat s16 volume adjustment.
ARM: NEON optimised vector_fmac_scalar()
dca: use vector_fmac_scalar from dsputil
dsputil: add vector_fmac_scalar()
latmenc: Fix private options
vf_unsharp: store hsub/vsub in the filter context
vf_unsharp: adopt a more natural order of params in apply_unsharp()
vf_unsharp: rename method "unsharpen" to "apply_unsharp"
vf_scale: apply the same transform to the aspect during init that is applied per frame
vf_pad: fix "vsub" variable value computation
vf_scale: add a "sar" variable
lavfi: fix realloc size computation in avfilter_add_format()
vsrc_color: use internal timebase
lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()
graphparser: prefer void * over AVClass * for log contexts
avfiltergraph: use meaningful error codes
avconv: Initialize return value for codec copy path.
fate: use 'run' helper for seek-test
fate: remove seek-mpeg2reuse test
Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
...
Conflicts:
doc/filters.texi
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/vf_scale.c
libavfilter/vsrc_color.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-29 01:11:01 +02:00
Carl Eugen Hoyos
a3a5c61c61
2/4 bpp png is supported.
2011-09-28 22:53:25 +02:00
Michael Niedermayer
237d31e0b9
h264: fix FIXME and use list_count in ff_h264_fill_mbaff_ref_list()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 22:28:47 +02:00
Michael Niedermayer
dc9ce40069
h264: More correct ref_count check in decode_slice_header()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 22:28:47 +02:00
Michael Niedermayer
514c44c4fa
sink_buffer: fix typo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 22:28:47 +02:00
Alex Converse
daf9890811
avconv: Reformat s16 volume adjustment.
2011-09-28 12:33:51 -07:00
Carl Eugen Hoyos
75f26a6f0b
Use "JPEG 2000" as long name for j2k.
2011-09-28 18:43:49 +02:00
Carl Eugen Hoyos
6a095afbbc
Encoding speex via libspeex is supported.
2011-09-28 18:34:42 +02:00
Nicolas George
194c2432ee
movenc: Replace av_realloc by av_realloc_f when relevant.
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 18:13:52 +02:00
Nicolas George
af84d9bb9e
gxfenc: Replace av_realloc by av_realloc_f when relevant.
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 18:13:52 +02:00
Nicolas George
247a1dc847
aviobuf: Replace av_realloc by av_realloc_f when relevant.
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 18:13:52 +02:00
Nicolas George
e47cfe9e5c
avienc: Replace av_realloc by av_realloc_f when relevant.
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 18:13:52 +02:00
Nicolas George
71e23d39a3
avidec: Replace av_realloc by av_realloc_f when relevant.
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 18:13:52 +02:00
Nicolas George
0cc44facf1
4xm: Replace av_realloc by av_realloc_f when relevant.
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 18:13:52 +02:00
Nicolas George
769298a686
libvpxenc: Replace av_realloc by av_realloc_f when relevant.
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 18:13:52 +02:00
Nicolas George
198ed6474d
bitstream: Replace av_realloc by av_realloc_f when relevant.
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 18:13:52 +02:00
Nicolas George
1d3b280e71
ffmpeg: Replace av_realloc by av_realloc_f when relevant.
...
Also mark with a visible comment "FIXME realloc failure" places where
av_realloc seems to lack a proper test for failure.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 18:13:52 +02:00
Nicolas George
5cd754bca2
Introduce av_realloc_f.
...
av_realloc_f helps avoiding memory-leaks in typical uses of realloc.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 18:13:52 +02:00
Nicolas George
b2600509fe
Introduce av_size_mult.
...
av_size_mult helps checking for overflow when computing the size of a memory
area.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 18:13:52 +02:00
Michael Niedermayer
e89f58810d
libx264: remove check_default_settings()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 18:13:52 +02:00
Clément Bœsch
f9d8a3423f
ffprobe: fix trailing '=' in stream id.
2011-09-28 17:57:22 +02:00
Stefano Sabatini
f63ec3eee9
lavfi: fix FF_API_* definition macros
...
Fix ABI break occurred after their use.
Bug reported and patch provided by chinsou, fix trac issue #516 ,
+80cola for me.
2011-09-28 17:24:52 +02:00
Mans Rullgard
baf6b738f2
ARM: NEON optimised vector_fmac_scalar()
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-09-28 15:56:09 +01:00
Mans Rullgard
a92a1b93b4
dca: use vector_fmac_scalar from dsputil
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-09-28 15:56:09 +01:00
Mans Rullgard
fcca826a63
dsputil: add vector_fmac_scalar()
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-09-28 15:56:08 +01:00
Nicolas George
b592f9bb65
swresample: remove unused variable.
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 16:11:01 +02:00
Nicolas George
a34869ed7d
libswr/rematrix: remove unused variable.
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 16:11:01 +02:00
Nicolas George
80287854c2
libswr/rematrix: add braces to silence a warning.
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 16:11:01 +02:00
Nicolas George
4a14dd76cf
bintext: remove unused variable.
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 16:11:01 +02:00
Nicolas George
fb35f7d7e1
vf_boxblur: remove useless code.
...
This block was probably leftovers from code refactoring.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 16:11:01 +02:00
Nicolas George
6d98e2db35
j2kdec: use correct printf format.
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 16:11:01 +02:00
Michael Niedermayer
7393b41744
j2kenc: Fix pointer<->integer casts.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 15:25:04 +02:00
Kieran Kunhya
32dfd8ca65
latmenc: Fix private options
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-09-28 15:49:07 +03:00
Stefano Sabatini
1c257dc32d
vf_unsharp: store hsub/vsub in the filter context
...
Also drop obfuscating CHROMA_WIDTH/HEIGHT macros.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-28 08:09:18 +02:00
Stefano Sabatini
e6d17ba426
vf_unsharp: adopt a more natural order of params in apply_unsharp()
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-28 08:09:03 +02:00
Stefano Sabatini
de7b58da3e
vf_unsharp: rename method "unsharpen" to "apply_unsharp"
...
More consistent with the original libmpcodecs code, and the name
"unsharpen" was confusing.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-28 08:08:56 +02:00
Michael Niedermayer
d33e0c6bc8
vf_scale: apply the same transform to the aspect during init that is applied per frame
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-28 08:08:30 +02:00
Stefano Sabatini
80de930a78
vf_pad: fix "vsub" variable value computation
...
It was shifting 2 rather than 1, +10l.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-28 08:03:30 +02:00
Stefano Sabatini
46b29397a6
vf_scale: add a "sar" variable
...
Also create a "dar" alias for the "a" variable, for avoiding possible
confusion between dar/sar.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-28 08:03:24 +02:00
Stefano Sabatini
0ec56d1144
lavfi: fix realloc size computation in avfilter_add_format()
...
Replace sizeof((*avff)->formats)
with sizeof(*(*avff)->formats)
as the size of the array element is given by the pointed element
rather than by its pointer.
In particular fix computation with the pending patch when
sizeof(int64_t) != sizeof(int64_t *).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-28 08:03:18 +02:00
Stefano Sabatini
e63e4c99c9
vsrc_color: use internal timebase
...
Avoid timescale conversion, simplify.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-28 08:03:11 +02:00
Stefano Sabatini
57fa314090
lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()
...
Require "void *" rather than "AVClass *" for the log context type.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-28 08:02:53 +02:00
Stefano Sabatini
64abd375ec
graphparser: prefer void * over AVClass * for log contexts
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-28 08:02:42 +02:00
Stefano Sabatini
59cef18c24
avfiltergraph: use meaningful error codes
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-28 08:02:32 +02:00