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
Alex Converse
4bb0b31f76
avconv: Initialize return value for codec copy path.
2011-09-27 19:32:26 -07:00
Michael Niedermayer
5a6e7771ed
h264: dont set key_frame when the frame is not a real keyframe.
...
Fixes Ticket514
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 03:47:39 +02:00
Mans Rullgard
dec4b4705f
fate: use 'run' helper for seek-test
...
This is simpler, and the actual seek-test command is printed with V=1.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-09-28 02:30:30 +01:00
Mans Rullgard
bc3a741fa0
fate: remove seek-mpeg2reuse test
...
The input file for this test is no longer generated.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-09-28 02:30:30 +01:00
Michael Niedermayer
530cd7a913
doc/ffmpeg.texi: merge changes from avconv.texi since last merge
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 03:19:22 +02:00
Michael Niedermayer
0aa793a1be
ffplay: fix forgotten codec_name checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 03:19:22 +02:00
Michael Niedermayer
2f3dd904f4
ffmpeg: fix wrong indention that leaked in from merge
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 03:19:22 +02:00
Laurent Aimar
1f024b8820
Check for out of bound reads in the flic decoder.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 02:59:28 +02:00
Michael Niedermayer
23c1db9b83
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avconv: use different variables for decoded and filtered frame.
avconv: add support for copying attachments.
matroskaenc: write attachments.
matroskadec: export mimetype of attachments as metadata.
avconv: factorize common code from new_*_stream()
doc/avconv: expand documentation for some options.
doc/avconv: document -timelimit.
Conflicts:
avconv.c
cmdutils.c
tests/codec-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 02:07:44 +02:00
Laurent Aimar
feca3ba053
Prevent out of bound accesses in the xan decoder.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 01:04:52 +02:00
Laurent Aimar
b9596a5037
Check for invalid/corrupted bitstream in sun raster decoder.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 00:52:37 +02:00
Laurent Aimar
19e95b8845
Prevent NULL dereferences when missing the reference frame in the xan decoder.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 00:49:25 +02:00
Laurent Aimar
039f3c33ff
Check for out of bounds reads in sun rasterfile decoder.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 00:24:51 +02:00
Laurent Aimar
61930119cb
Check for corrupted extra data in wmavoice decoder.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 00:20:04 +02:00
Laurent Aimar
e09ae22ab7
Check for out of bound writes in the wmavoice decoder.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28 00:18:38 +02:00
Laurent Aimar
66aae97a60
Prevent NULL dereferences when missing the reference frame in the bink decoder.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27 23:45:37 +02:00
Michael Niedermayer
77d2ef13a8
Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
...
Whitespace of the patch cleaned up by Aurel
Some of the issues have been reported by Steve Manzuik / Microsoft Vulnerability Research (MSVR)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 956c901c68
)
Further suggestions from Kostya <kostya.shishkov@gmail.com> have been
implemented by Reinhard Tartler <siretart@tauware.de>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-09-27 23:14:05 +02:00
Alex Converse
a9a033773a
avconv: Fix volume adjustment for non-s16 sample formats
2011-09-27 14:10:12 -07:00
Alex Converse
fe332cf5b9
avconv: Make samples void*.
...
Different sample formats are different sizes.
2011-09-27 14:10:12 -07:00
Alex Converse
af3c06b4db
avconv: Use the size of the decode sample format when allocating the audio samples buffer.
2011-09-27 14:10:12 -07:00
Tomas Härdin
a1cb09d351
mxf: Add PictureEssenceCoding UL for V210
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27 22:27:52 +02:00
Michael Niedermayer
36be0f2e31
ffplay.texi: document -codec
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27 22:00:20 +02:00
Michael Niedermayer
5eda0967a5
ffplay: support -codec:avs to force a specific decoder implementation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27 21:56:20 +02:00
Michael Niedermayer
07a96dc1e9
regression tests: add jpeg2000
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27 21:32:39 +02:00
Michael Niedermayer
2fbf691038
j2kenc: Fix use of value before its initialized.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27 21:32:39 +02:00