9dfa5ea5dc
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 >
2013-07-03 14:46:10 +02:00
a4a16821d7
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 >
2013-07-03 14:38:37 +02:00
2cad1ea29e
Merge commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58'
...
* commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58':
jpeg2000: Check zero bit-plane validity
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-03 14:30:17 +02:00
db5c93a1a9
Merge commit '7e201d575dc4385eb67314b0419d4d77185e65f4'
...
* commit '7e201d575dc4385eb67314b0419d4d77185e65f4':
jpeg2000: Validate block lengthinc
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-03 14:28:51 +02:00
f0358dc1d3
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 >
2013-07-03 14:19:35 +02:00
2e85737b0e
Merge commit 'd3cb302b88503c3111e25add196622110c056188'
...
* commit 'd3cb302b88503c3111e25add196622110c056188':
jpeg2000: Validate SOT parsing
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-03 13:28:35 +02:00
5efbeae38c
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.
2013-07-03 13:16:33 +02:00
57bc64e235
Merge commit '1a3598aae768465a8efc8475b6df5a8261bc62fc'
...
* commit '1a3598aae768465a8efc8475b6df5a8261bc62fc':
jpeg2000: Use bytestream2
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-03 12:54:01 +02:00
26f6acc66b
Merge commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4'
...
* commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4':
jpeg2000: Clean up return paths and error messages
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-03 12:16:24 +02:00
b0448e5123
Merge commit 'be3271009ef893fbed9640e8edbd771685fd957b'
...
* commit 'be3271009ef893fbed9640e8edbd771685fd957b':
jpeg2000: Define the maximum decomposition levels
Conflicts:
libavcodec/jpeg2000.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-03 12:02:11 +02:00
3f0364327c
Merge commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e'
...
* commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e':
jpeg2000: Check code-block size
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-03 11:55:45 +02:00
37a970bbb6
Merge commit '5650e331a733711b809bc27f968500f0f5530126'
...
* commit '5650e331a733711b809bc27f968500f0f5530126':
jpeg2000: Validate resolution levels
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-03 11:20:39 +02:00
b2498dcf5c
lavc/avcodec.h: fix prolems -> problems typo
2013-07-03 10:15:30 +02:00
86a2602e16
jpeg2000: Drop unused and writeonly fields
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2013-07-02 20:05:44 +02:00
fd54dd028b
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 >
2013-07-02 20:05:44 +02:00
17e5d614a8
jpeg2000: Check zero bit-plane validity
...
Prevent integer overflows.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2013-07-02 20:05:44 +02:00
7e201d575d
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 >
2013-07-02 20:05:44 +02:00
278a923c51
jpeg2000: Validate SIZ parsing
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2013-07-02 20:05:44 +02:00
d3cb302b88
jpeg2000: Validate SOT parsing
...
Avoid some overreads.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2013-07-02 20:05:44 +02:00
ac921338a4
jpeg2000: Correctly calculate sgnd
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2013-07-02 20:05:44 +02:00
eae63e3c15
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 >
2013-07-02 20:05:44 +02:00
1a3598aae7
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 >
2013-07-02 20:05:43 +02:00
5efadcb8cd
jpeg2000: Clean up return paths and error messages
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2013-07-02 20:05:43 +02:00
be3271009e
jpeg2000: Define the maximum decomposition levels
...
And define the resolution levels according.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2013-07-02 20:05:43 +02:00
fbcc03db8f
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 >
2013-07-02 20:05:43 +02:00
5650e331a7
jpeg2000: Validate resolution levels
...
There are 32 maximum decomposition levels, thus 33 resolution levels.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2013-07-02 20:05:43 +02:00
a35494c566
h264: fix indention of xchg_mb_border()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-02 03:27:14 +02:00
f27b22b497
h264: move 444 border xchg under if (deblock_top)
...
Fixes out of array access
Fixes Ticket2668
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-02 03:27:04 +02:00
b791a0831b
avcodec/x86/dsputil_init: only use xvid idct for lowres=0
...
Fixes crash
Fixes Ticket2714
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-01 20:56:37 +02:00
280afa40bc
Merge commit 'dd3754a48854cd570d38db72394491aab0f36570'
...
* commit 'dd3754a48854cd570d38db72394491aab0f36570':
indeo: use proper error code
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-01 11:37:37 +02:00
43229d609a
Merge commit '7388c0c58601477db076e2e74e8b11f8a644384a'
...
* commit '7388c0c58601477db076e2e74e8b11f8a644384a':
indeo: Properly forward the error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-01 11:31:25 +02:00
8bd9039900
Revert "indeo5: reject negative motion vectors"
...
Negative motion vectors are possible.
This reverts commit 1194a41080
2013-07-01 06:49:46 +02:00
b36e1893ef
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
2013-07-01 04:20:58 +02:00
1194a41080
indeo5: reject negative motion vectors
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-01 04:20:51 +02:00
dd3754a488
indeo: use proper error code
2013-07-01 04:17:46 +02:00
7388c0c586
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
2013-07-01 04:17:46 +02:00
b42bcaef29
Avoid a null pointer dereference in avcodec_decode_audio4().
...
This could happen if oom occured while probing a file.
Fixes ticket #2722 .
2013-07-01 03:07:44 +02:00
709cae2bcb
vorbisdec: Check VLC tables during use instead of setup
...
Fixes regression and Ticket2720
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-01 02:09:29 +02:00
ae038c0914
vorbisdec: propagate errors from setup_classifs()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-01 02:08:50 +02:00
1221bb6239
x86: lpc: fix a segfault in av_evaluate_lls_sse2()
2013-06-30 23:11:19 +00:00
712ef25116
Avoid a null pointer dereference after oom on frame size change in mpegvideo.c.
...
Fixes ticket #2735 .
2013-06-30 23:45:37 +02:00
f4aa8085f2
Avoid a null pointer dereference on oom in the aac encoder.
...
Fixes ticket #2732 .
2013-06-30 23:25:18 +02:00
84343dd9d3
indeo3: check return values of av_malloc()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-06-30 19:43:55 +00:00
b00e56bec5
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Support compilation on aix with gcc.
Rename "AVClass class" as "AVClass component_class".
Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.
Rename thread_init() in libavcodec and libavfilter as library_thread_init().
Rename constant HZ in af_biquads.c as HERTZ.
Drop local lable from ppc asm timer.
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-06-30 21:18:17 +02:00
7e112df470
flac_parser: check return value of av_fifo_alloc()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-06-30 16:49:45 +00:00
afddf0d910
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mjpeg: Check the unescaped size for overflows
Conflicts:
libavcodec/mjpegdec.c
See: a9456c7c5cmichaelni@gmx.at >
2013-06-30 14:11:38 +02:00
e3fb8ac956
Merge commit '7520d9779c6d30b385df5a0a42da508238076192'
...
* commit '7520d9779c6d30b385df5a0a42da508238076192':
mjpeg: Move code out of else branch
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-06-30 13:50:55 +02:00
0915b531bc
Rename "AVClass class" as "AVClass component_class".
...
The aix header math.h defines "extern int class()" for C.
2013-06-30 13:47:45 +02:00
742b961769
Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.
...
The aix header sys/mstsave.h defines FRAMESIZE as _FRAMESIZE.
2013-06-30 13:47:45 +02:00
674d8a9629
Rename thread_init() in libavcodec and libavfilter as library_thread_init().
...
The aix header sys/thread.h contains a definition for thread_init().
2013-06-30 13:47:45 +02:00
Michael Niedermayer