Michael Niedermayer [Wed, 3 Jul 2013 14:22:11 +0000 (16:22 +0200)]
Merge commit '
d57c737ac30cf079a342fa649fd4888c2d059dd9'
* commit '
d57c737ac30cf079a342fa649fd4888c2d059dd9':
jpeg2000: Simplify jpeg2000_decode_packets()
jpeg2000: Do not crash on NULL node in tag_tree_decode
jpeg2000: Refactor SOT marker parsing
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 14:11:01 +0000 (16:11 +0200)]
Merge commit '
daeb4e3042f2ecae2d41aaa4cae0bed932539788'
* commit '
daeb4e3042f2ecae2d41aaa4cae0bed932539788':
jpeg2000: Proper cleanup on failure in decode_frame()
Conflicts:
libavcodec/jpeg2000.c
See:
9d56ccf5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 13:45:03 +0000 (15:45 +0200)]
Merge commit '
589e5b52f634f6b2d307a167a19eef7e7328cb08'
* commit '
589e5b52f634f6b2d307a167a19eef7e7328cb08':
jpeg2000: Use the correct sizeof in memset for T1 data
jpeg2000: Simplify init_tile()
jpeg2000: Update pixel format support
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 13:38:45 +0000 (15:38 +0200)]
Merge commit '
db13e02c6f0355fabd540e77b61ade127d6411ff'
* commit '
db13e02c6f0355fabd540e77b61ade127d6411ff':
jpeg2000: Compute corrections of sub-band coordinates
jpeg2000: Remove unneeded variable initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 13:30:05 +0000 (15:30 +0200)]
Merge commit '
5bf208f659703895df7926238dcfa8a8175de36b'
* commit '
5bf208f659703895df7926238dcfa8a8175de36b':
jpeg2000: Use separate fields for int and float codepaths
jpeg2000: Split int/float codepaths depending on the DWT
Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 13:20:37 +0000 (15:20 +0200)]
Merge commit '
f9581f1414ec8e3e7d0868793cda4f2e4fa113ea'
* commit '
f9581f1414ec8e3e7d0868793cda4f2e4fa113ea':
jpeg2000: Improve reduced resolution decoding
jpeg2000: Compute quantization for 'scalar derived' in the correct case.
jpeg2000: Calculate code-block coord in ff_jpeg2000_init_component()
Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 13:03:08 +0000 (15:03 +0200)]
Merge commit '
4cbd5ed11b0161a6a192174934b241e0cc0599a9'
* commit '
4cbd5ed11b0161a6a192174934b241e0cc0599a9':
jpeg2000: Fix compute precedence error in lut_gain index
jpeg2000: Initialize code blocks structures in precincts to 0
jpeg2000: Check that we have enough components for MCT
Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 12:59:35 +0000 (14:59 +0200)]
Merge commit '
b564784a207b1395d2b5a41e580539df04651096'
* commit '
b564784a207b1395d2b5a41e580539df04651096':
jpeg2000: Check that there is a SOT before SOD
jpeg2000: Remove unneeded returns
Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 12:49:28 +0000 (14:49 +0200)]
Merge commit '
ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f'
* commit '
ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f':
jpeg2000: Propagate error code from get_cox()
jpeg2000: Check that nreslevels2decode has been initialized before use
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 12:46:10 +0000 (14:46 +0200)]
Merge commit '
86a2602e16171ddc10c3ec655c23b16ffa595059'
* commit '
86a2602e16171ddc10c3ec655c23b16ffa595059':
jpeg2000: Drop unused and writeonly fields
jpeg2000: Correctly calculate sgnd
Conflicts:
libavcodec/jpeg2000.h
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 12:38:37 +0000 (14:38 +0200)]
Merge commit '
fd54dd028bc9f7bfb80ebf823a533dc84b73f936'
* commit '
fd54dd028bc9f7bfb80ebf823a533dc84b73f936':
jpeg2000: check len before parsing header
jpeg2000: Check component number in get_coc() and get_qcc()
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 12:30:17 +0000 (14:30 +0200)]
Merge commit '
17e5d614a8647d51b9795cb8bccf97ee33ca2d58'
* commit '
17e5d614a8647d51b9795cb8bccf97ee33ca2d58':
jpeg2000: Check zero bit-plane validity
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 12:20:36 +0000 (14:20 +0200)]
Merge commit '
7e201d575dc4385eb67314b0419d4d77185e65f4'
* commit '
7e201d575dc4385eb67314b0419d4d77185e65f4':
jpeg2000: Validate block lengthinc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 11:57:59 +0000 (13:57 +0200)]
Merge commit '
278a923c51187d37445d88a6b21082036ec9568d'
* commit '
278a923c51187d37445d88a6b21082036ec9568d':
jpeg2000: Validate SIZ parsing
Conflicts:
libavcodec/jpeg2000dec.c
This commit is not exactly merged due to bugs in it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 11:20:57 +0000 (13:20 +0200)]
Merge commit '
d3cb302b88503c3111e25add196622110c056188'
* commit '
d3cb302b88503c3111e25add196622110c056188':
jpeg2000: Validate SOT parsing
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 1 Jul 2013 23:39:14 +0000 (01:39 +0200)]
lavfi: create Libav-API compatibility layer for avfilter_graph_parse() at the next bump
Add function avfilter_graph_parse_ptr() and favor it in place of
avfilter_graph_parse(), which will be restored with the old/Libav
signature at the next bump.
If HAVE_INCOMPATIBLE_LIBAV_API is enabled it will use the
Libav-compatible signature for avfilter_graph_parse().
At the next major bump the current implementation of
avfilter_graph_parse() should be dropped in favor of the Libav/old
implementation.
Should address trac ticket #2672.
Stefano Sabatini [Mon, 1 Jul 2013 16:47:09 +0000 (18:47 +0200)]
configure: rename have_incompatible_fork_abi -> have_incompatible_libav_abi
"Fork" is an ambiguous term, since there may be more than one fork, also
"fork" could be confused with the corresponding function. Also it seems
important to point the name of the referenced fork in the symbol.
Note: the old --enable-incompatible-fork-abi command is retained for
compatibility, although it should be considered deprecated.
Michael Niedermayer [Wed, 3 Jul 2013 11:00:57 +0000 (13:00 +0200)]
Merge commit '57bc64e'
* commit '57bc64e':
jpeg2000: Use bytestream2
jpeg2000: Clean up return paths and error messages
jpeg2000: Define the maximum decomposition levels
jpeg2000: Check code-block size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 10:59:59 +0000 (12:59 +0200)]
Revert "doc: add script to compute texi files dependencies"
This reverts commit
628ceac6526724d35cb390cc1f88344f4ea22eb4.
The commit broke out of tree builds
Michael Niedermayer [Wed, 3 Jul 2013 10:54:01 +0000 (12:54 +0200)]
Merge commit '
1a3598aae768465a8efc8475b6df5a8261bc62fc'
* commit '
1a3598aae768465a8efc8475b6df5a8261bc62fc':
jpeg2000: Use bytestream2
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 10:16:24 +0000 (12:16 +0200)]
Merge commit '
5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4'
* commit '
5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4':
jpeg2000: Clean up return paths and error messages
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 10:02:11 +0000 (12:02 +0200)]
Merge commit '
be3271009ef893fbed9640e8edbd771685fd957b'
* commit '
be3271009ef893fbed9640e8edbd771685fd957b':
jpeg2000: Define the maximum decomposition levels
Conflicts:
libavcodec/jpeg2000.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 09:55:45 +0000 (11:55 +0200)]
Merge commit '
fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e'
* commit '
fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e':
jpeg2000: Check code-block size
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 25 Jun 2013 22:06:53 +0000 (00:06 +0200)]
examples/muxing: make more compact audio/video_time computation
Timothy Gu [Wed, 3 Jul 2013 02:32:27 +0000 (19:32 -0700)]
doc/muxers: Add AIFF doc
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Tue, 28 May 2013 19:52:33 +0000 (21:52 +0200)]
doc: add script to compute texi files dependencies
Replace the inline awk script with a Perl script which tracks the
dependencies recursively.
This allows to correctly track dependencies for files including files
with a second level include (for example: ffmpeg-devices.texi ->
devices.texi -> outdevs.texi).
This also adds a dependency on perl for computing the dependencies, which
should not be a problem since perl is already required all the way for
building documentation.
Michael Niedermayer [Wed, 3 Jul 2013 09:20:39 +0000 (11:20 +0200)]
Merge commit '
5650e331a733711b809bc27f968500f0f5530126'
* commit '
5650e331a733711b809bc27f968500f0f5530126':
jpeg2000: Validate resolution levels
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 2 Jul 2013 09:21:44 +0000 (11:21 +0200)]
lavc/avcodec.h: fix prolems -> problems typo
Michael Niedermayer [Wed, 3 Jul 2013 00:26:13 +0000 (02:26 +0200)]
MAINTAINERS: add address to contact "AvxSynth Team"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tudor Suciu [Sun, 2 Jun 2013 15:49:24 +0000 (17:49 +0200)]
avformat/matroskaenc: Allow VP9 and Opus in webm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:31 +0000 (10:01 +0200)]
jpeg2000: Simplify jpeg2000_decode_packets()
Raise PATCHWELCOME error in case of non-implemented progression order.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Mon, 1 Jul 2013 08:01:28 +0000 (10:01 +0200)]
jpeg2000: Proper cleanup on failure in decode_frame()
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:30 +0000 (10:01 +0200)]
jpeg2000: Do not crash on NULL node in tag_tree_decode
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:29 +0000 (10:01 +0200)]
jpeg2000: Refactor SOT marker parsing
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:27 +0000 (10:01 +0200)]
jpeg2000: Use the correct sizeof in memset for T1 data
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:24 +0000 (10:01 +0200)]
jpeg2000: Compute corrections of sub-band coordinates
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:22 +0000 (10:01 +0200)]
jpeg2000: Use separate fields for int and float codepaths
Split stepsize and data into int and float variants.
Eliminates a number of casts and simplifies spotting errors.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:20 +0000 (10:01 +0200)]
jpeg2000: Improve reduced resolution decoding
Correctly scale down the component coordinates and
clean up some redundant code.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:26 +0000 (10:01 +0200)]
jpeg2000: Simplify init_tile()
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:23 +0000 (10:01 +0200)]
jpeg2000: Remove unneeded variable initialization
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:21 +0000 (10:01 +0200)]
jpeg2000: Split int/float codepaths depending on the DWT
DWT53 is always int, DWT97 is always float.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:25 +0000 (10:01 +0200)]
jpeg2000: Update pixel format support
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:17 +0000 (10:01 +0200)]
jpeg2000: Fix compute precedence error in lut_gain index
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:14 +0000 (10:01 +0200)]
jpeg2000: Check that there is a SOT before SOD
Avoid overreads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:12 +0000 (10:01 +0200)]
jpeg2000: Propagate error code from get_cox()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:19 +0000 (10:01 +0200)]
jpeg2000: Compute quantization for 'scalar derived' in the correct case.
Scalar derived case is represented by the JPEG2K_QSTY_SI define.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:16 +0000 (10:01 +0200)]
jpeg2000: Initialize code blocks structures in precincts to 0
Prevent use of uninitialized memory / valgrind failure.
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:13 +0000 (10:01 +0200)]
jpeg2000: Remove unneeded returns
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:11 +0000 (10:01 +0200)]
jpeg2000: Check that nreslevels2decode has been initialized before use
Avoid buffer overread.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:18 +0000 (10:01 +0200)]
jpeg2000: Calculate code-block coord in ff_jpeg2000_init_component()
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:15 +0000 (10:01 +0200)]
jpeg2000: Check that we have enough components for MCT
Avoid overread.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:10 +0000 (10:01 +0200)]
jpeg2000: Drop unused and writeonly fields
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:08 +0000 (10:01 +0200)]
jpeg2000: check len before parsing header
Avoid overread.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:06 +0000 (10:01 +0200)]
jpeg2000: Check zero bit-plane validity
Prevent integer overflows.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Mon, 1 Jul 2013 08:01:05 +0000 (10:01 +0200)]
jpeg2000: Validate block lengthinc
Currently we are using an array with a static data size.
Similar to a patch with the same purpose by Michael Niedermayer.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:04 +0000 (10:01 +0200)]
jpeg2000: Validate SIZ parsing
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:03 +0000 (10:01 +0200)]
jpeg2000: Validate SOT parsing
Avoid some overreads.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:09 +0000 (10:01 +0200)]
jpeg2000: Correctly calculate sgnd
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:07 +0000 (10:01 +0200)]
jpeg2000: Check component number in get_coc() and get_qcc()
Avoid overreads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:01:02 +0000 (10:01 +0200)]
jpeg2000: Use bytestream2
Prevent a number of overreads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Mon, 1 Jul 2013 08:01:01 +0000 (10:01 +0200)]
jpeg2000: Clean up return paths and error messages
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Mon, 1 Jul 2013 08:01:00 +0000 (10:01 +0200)]
jpeg2000: Define the maximum decomposition levels
And define the resolution levels according.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 1 Jul 2013 08:00:59 +0000 (10:00 +0200)]
jpeg2000: Check code-block size
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Mon, 1 Jul 2013 08:00:58 +0000 (10:00 +0200)]
jpeg2000: Validate resolution levels
There are 32 maximum decomposition levels, thus 33 resolution levels.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
wm4 [Fri, 28 Jun 2013 08:36:00 +0000 (10:36 +0200)]
lavf: add support for libgme
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean Delvare [Tue, 2 Jul 2013 11:55:34 +0000 (13:55 +0200)]
Add a maintainer for the delogo filter
I volunteer to maintain the delogo filter for at least the year to
come.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
patch/commit split by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean Delvare [Tue, 2 Jul 2013 11:55:34 +0000 (13:55 +0200)]
MAINTAINERS: clarify the expected format in the document header
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Patch/commit split by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jul 2013 13:06:43 +0000 (15:06 +0200)]
avformat_find_stream_info: move ret init down from flush codecs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jul 2013 13:04:13 +0000 (15:04 +0200)]
avformat_find_stream_info: Do not consider no streams an error in flush codecs
This should have no functional effect, but allows a cleaner diff when moving it
down
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jul 2013 13:02:55 +0000 (15:02 +0200)]
avformat_find_stream_info: try to preserve the error code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jul 2013 13:00:28 +0000 (15:00 +0200)]
av_find_stream_info: initialize ret
This should fix hypothetical corner cases where it might have never been initialized before use
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 20 Jun 2013 07:34:15 +0000 (09:34 +0200)]
avformat: Print "Consider increasing the value for analzeduration and probesize" even more often
The sample from ticket #2691 currently does not trigger "Consider increasing
the value for analzeduration and probesize" because the audio streams are
only added after calling estimate_timings(). Attached patch moves the message
below this function call.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jul 2013 09:58:08 +0000 (11:58 +0200)]
avutil/x86: reenable ff_update_lls_avx()
The bug has been fixed in
c8b920a9b7fa534a6141695ace4e8c2dfcd56cee by Loren Merritt
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jul 2013 09:50:30 +0000 (11:50 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
oggdec: do not fall back on binary search in the generic code.
Conflicts:
libavformat/oggdec.c
tests/ref/seek/lavf-ogg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jul 2013 09:40:38 +0000 (11:40 +0200)]
Merge commit '
c8b920a9b7fa534a6141695ace4e8c2dfcd56cee'
* commit '
c8b920a9b7fa534a6141695ace4e8c2dfcd56cee':
lls/x86: use 3-operator vaddpd in ADDPD_MEM
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jul 2013 09:26:49 +0000 (11:26 +0200)]
Merge commit '
8bd9039900e67a633cc838d691c449e71c060553'
* commit '
8bd9039900e67a633cc838d691c449e71c060553':
Revert "indeo5: reject negative motion vectors"
See:
cc53c28fdc2bd060e90a82d4238ad26e619a9fca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Fri, 28 Jun 2013 16:38:37 +0000 (18:38 +0200)]
oggdec: do not fall back on binary search in the generic code.
Binary search is already attempted in the format-specific seek function,
so the fallback is only reached if binary search failed already.
Loren Merritt [Tue, 2 Jul 2013 05:56:56 +0000 (07:56 +0200)]
lls/x86: use 3-operator vaddpd in ADDPD_MEM
Fixes build with yasm-1.1
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Tue, 2 Jul 2013 00:11:49 +0000 (02:11 +0200)]
h264: fix indention of xchg_mb_border()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jul 2013 23:41:19 +0000 (01:41 +0200)]
h264: move 444 border xchg under if (deblock_top)
Fixes out of array access
Fixes Ticket2668
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Tue, 25 Jun 2013 22:53:26 +0000 (00:53 +0200)]
lavf/http: add support for reading streamcast metadata
Allow applications to request reading streamcast metadata. This uses
AVOptions as API, and requires the application to explicitly request
and read metadata. Metadata can be updated mid-stream; if an
application is interested in that, it has to poll for the data by
reading the "icy_metadata_packet" option in regular intervals.
There doesn't seem to be a nice way to transfer the metadata in a nicer
way. Converting the metadata to ID3v2 tags might be a nice idea, but
the libavformat mp3 demuxer doesn't seem to read these tags mid-stream,
and even then we couldn't guarantee that tags are not inserted in the
middle of mp3 packet data.
This commit provides the minimum to enable applications to retrieve
this information at all.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Michael Niedermayer [Mon, 1 Jul 2013 21:38:08 +0000 (23:38 +0200)]
rmdec: Pass AVIOContext to rm_read_metadata()
Fix null pointer dereference
Fixes Ticket2588
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 1 Jul 2013 22:15:25 +0000 (22:15 +0000)]
westwood_vqa: check return value of av_malloc()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 1 Jul 2013 22:04:48 +0000 (22:04 +0000)]
idcin: check return value of av_malloc()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 1 Jul 2013 21:37:16 +0000 (21:37 +0000)]
bfi: check return value of av_malloc()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 1 Jul 2013 18:48:38 +0000 (20:48 +0200)]
avcodec/x86/dsputil_init: only use xvid idct for lowres=0
Fixes crash
Fixes Ticket2714
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 1 Jul 2013 13:59:51 +0000 (15:59 +0200)]
doc/encoders: apply various fixes to libmp3lame documentation
Michael Niedermayer [Mon, 1 Jul 2013 10:03:17 +0000 (12:03 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo: check for reference when inheriting mvs
See:
4b35ee0b7c0c4cbac3541a25a5e8c00b657c8f95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jul 2013 09:45:28 +0000 (11:45 +0200)]
Merge commit '
1194a410807bac3eafbeb632578b937656d273e7'
* commit '
1194a410807bac3eafbeb632578b937656d273e7':
indeo5: reject negative motion vectors
The added check is wrong and thus not merged.
A correct check already exists in avcodec.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jul 2013 09:37:13 +0000 (11:37 +0200)]
Merge commit '
dd3754a48854cd570d38db72394491aab0f36570'
* commit '
dd3754a48854cd570d38db72394491aab0f36570':
indeo: use proper error code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jul 2013 09:31:16 +0000 (11:31 +0200)]
Merge commit '
7388c0c58601477db076e2e74e8b11f8a644384a'
* commit '
7388c0c58601477db076e2e74e8b11f8a644384a':
indeo: Properly forward the error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Jean Delvare [Wed, 26 Jun 2013 12:50:37 +0000 (14:50 +0200)]
lavfi/delogo: use weighted interpolation
The original delogo algorithm interpolates both horizontally and
vertically and uses the average to compute the resulting sample. This
works reasonably well when the logo area is almost square. However
when the logo area is significantly larger than high or higher than
large, the result is largely suboptimal.
The issue can be clearly seen by testing the delogo filter with a fake
logo area that is 200 pixels large and 2 pixels high. Vertical
interpolation gives a very good result in that case, horizontal
interpolation gives a very bad result, and the overall result is poor,
because both are given the same weight.
Even when the logo is roughly square, the current algorithm gives poor
results on the borders of the logo area, because it always gives
horizontal and vertical interpolations an equal weight, and this is
suboptimal on borders. For example, in the middle of the left hand
side border of the logo, you want to trust the left known point much
more than the right known point (which the current algorithm already
does) but also much more than the top and bottom known points (which
the current algorithm doesn't do.)
By properly weighting each known point when computing the value of
each interpolated pixel, the visual result is much better, especially
on borders and/or for high or large logo areas.
The algorithm I implemented guarantees that the weight of each of the
4 known points directly depends on its distance to the interpolated
point. It is largely inspired from the original algorithm, the key
difference being that it computes the relative weights globally
instead of separating the vertical and horizontal interpolations and
combining them afterward.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Luca Barbato [Mon, 1 Jul 2013 04:49:46 +0000 (06:49 +0200)]
Revert "indeo5: reject negative motion vectors"
Negative motion vectors are possible.
This reverts commit
1194a410807bac3eafbeb632578b937656d273e7.
Luca Barbato [Sun, 30 Jun 2013 08:40:37 +0000 (10:40 +0200)]
indeo: check for reference when inheriting mvs
The same is done already for qdelta.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sun, 30 Jun 2013 08:35:07 +0000 (10:35 +0200)]
indeo5: reject negative motion vectors
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sun, 30 Jun 2013 08:11:05 +0000 (10:11 +0200)]
indeo: use proper error code
Luca Barbato [Sun, 30 Jun 2013 07:57:56 +0000 (09:57 +0200)]
indeo: Properly forward the error codes
If the tile data size does not match the buffer size it did not
return an AVERROR_INVALIDDATA causing futher corruption later.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Carl Eugen Hoyos [Mon, 1 Jul 2013 01:07:44 +0000 (03:07 +0200)]
Avoid a null pointer dereference in avcodec_decode_audio4().
This could happen if oom occured while probing a file.
Fixes ticket #2722.
Michael Niedermayer [Mon, 1 Jul 2013 00:41:22 +0000 (02:41 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: always send zero packets to flush audio decoders
ffplay: use frame->pkt_pts instead of pkt->pts in audio pts calculation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 1 Jul 2013 00:27:47 +0000 (02:27 +0200)]
Revert "avutil/x86: disable ff_evaluate_lls_sse2() for 32bit"
This reverts commit
247425241cb3b2b76df1c2aced5ce0d56126b82d.