Paul B Mahol
abf1e59ef2
libaacplus: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 19:41:43 +00:00
Paul B Mahol
6d53034483
libaacplus: cosmetics: fix indentation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 19:41:43 +00:00
Paul B Mahol
963c58006f
libaacplus: move profile check above, simplifies code a little
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 19:41:38 +00:00
Michael Niedermayer
eee19198ef
avcodec/libfaac: fallback to a supported bitrate if the requested is not supported
...
Fixes: Ticket2587
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 15:37:48 +02:00
Michael Niedermayer
ef43b9496b
avcodec/mpegvideo: remove empty comments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 14:43:42 +02:00
Darryl Wallace
3e16047507
s302m encoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 12:03:06 +00:00
Paul B Mahol
fbd0f91a3a
escape130: switch to init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 10:21:12 +00:00
Michael Niedermayer
ac2c52174f
avcodec/wavpack: remove ;;
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 12:07:31 +02:00
Paul B Mahol
79f452f4e6
fraps: set avctx->color_range
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23 10:05:28 +00:00
Michael Niedermayer
b7d16dc4bd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
wavpack: check packet size early
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 10:55:46 +02:00
Michael Niedermayer
402bec52d4
Merge commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62'
...
* commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62':
wavpack: use bytestream2 in wavpack_decode_block
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 10:46:05 +02:00
Michael Niedermayer
1724123c65
Merge commit '3eae9b030cbbdc263f69834b791624613032d548'
...
* commit '3eae9b030cbbdc263f69834b791624613032d548':
mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-23 10:25:25 +02:00
Luca Barbato
fd06291239
wavpack: check packet size early
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-22 22:02:57 +02:00
Luca Barbato
3f0b6d7a62
wavpack: use bytestream2 in wavpack_decode_block
...
Prevent most out of buffer reads.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-22 22:02:55 +02:00
Michael Niedermayer
657875b145
avcodec/aic: Fix vlc value checks
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 21:30:28 +02:00
Michael Niedermayer
30df9789a9
proresdec: Fix end condition
...
Fixes out of array writes
No FFmpeg release is affected by this
This also fixes some artifacts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 20:24:50 +02:00
Michael Niedermayer
df3ee7b9a9
smvjpegdec: use av_pix_fmt_desc_get() avoid direct table access
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 20:24:50 +02:00
Michael Niedermayer
ad22767cb6
shorten: fix "off by padding" bug
...
Fixes array overread
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 17:40:12 +02:00
Janne Grunau
3eae9b030c
mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes
...
ff_mpeg_unref_picture clears the flag indicating that the frame needs to
be reallocated after a frame size change. Since we have now reference
counted buffers we can unref the buffers immediately.
2013-05-22 15:40:12 +02:00
Ash Hughes
14ec9d2590
Support playing SMV files.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 15:20:22 +02:00
Michael Niedermayer
914ab4cd1c
j2kdec & jpeg2000dec: check lengthinc against array size
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 04:18:38 +02:00
Michael Niedermayer
17e66c9ff4
j2k & jpeg2000dec: reset numX/Ytiles if tiles failed allocation
...
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 03:18:55 +02:00
Michael Niedermayer
53f0442464
avcodec/jpeg2000dec: Port tile size check from j2kdec
...
Fixes potential integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 03:16:52 +02:00
Michael Niedermayer
73ffab4195
jpeg2000dec: check TPsot
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 02:53:21 +02:00
Michael Niedermayer
fec8783883
jpeg2000dec: read and check curtileno
...
Fixes out of array accesses
Code ported from j2kdec
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 02:29:49 +02:00
Michael Niedermayer
f399b33c2b
jpeg2000dec & j2kdec: Fix return type of get_sot()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 02:14:04 +02:00
Michael Niedermayer
4a9a6a1f35
vcodec/jpeg2000dec: fix av_log() type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 02:05:50 +02:00
Michael Niedermayer
8d9fa738f5
j2kdec: cosmetics from jpeg2000dec
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 01:25:52 +02:00
Michael Niedermayer
0b42631641
avcodec/jpeg2000dec: merge bytestream2 reading from j2kdec
...
This fixes at least one out of array access
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 01:24:47 +02:00
Michael Niedermayer
c649ecb3b2
avcodec/jpeg2000dec: get_qcx, fix stack and heap overwrites
...
This is likely remotely exploitable
Fix ported from j2kdec
No uptodate FFmpeg release should be affected by this
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-22 00:07:45 +02:00
Michael Niedermayer
069ede2981
jpeg2000dec: Check ncomponents and tile dimensions
...
Fixes various problems
Code ported from j2kdec
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 21:44:34 +02:00
Michael Niedermayer
78c7bff04a
avcodec/j2k: rename J2K_ constants to JPEG2000_
...
This should simplify merging the 2 decoders
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 21:44:34 +02:00
Michael Niedermayer
0ab0ed2b86
j2k: Rename structs to be more similar to jpeg2000dec
...
This should simplify merging
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 21:44:34 +02:00
Michael Niedermayer
376e89e280
j2kdec: s/decode_packets/jpeg2000_decode_packets/
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 21:44:34 +02:00
Paul B Mahol
dbb49a6539
vp3: zero allocated tables
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-21 17:49:29 +00:00
Michael Niedermayer
b1bbd715d8
avcodec/huffman: increase bits constant
...
Fixes Ticket2593
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 13:51:04 +02:00
Michael Niedermayer
b9ea6a8414
avcodec/huffman: use named identifer for the bits constant
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 13:51:04 +02:00
Michael Niedermayer
1d7e6a6bde
avcodec/bitstream: print vlc length in error case.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 13:51:04 +02:00
Michael Niedermayer
b60a65ee2d
mjpegdec: fix AV_PIX_FMT_YUVJ411P handling
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 12:56:12 +02:00
Michael Niedermayer
a90baa63c3
add YUVJ411P
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 12:56:11 +02:00
Michael Niedermayer
1d8b1f0e51
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
proresdec: simplify slice component offsets handling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 12:01:58 +02:00
Michael Niedermayer
6ef7b6af6b
Merge commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8'
...
* commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8':
mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac
Conflicts:
libavcodec/mjpegdec.c
See: 1f41cffe1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 12:01:37 +02:00
Michael Niedermayer
3b071a4390
Merge commit 'a030279a67ef883df8cf3707774656fa1be81078'
...
* commit 'a030279a67ef883df8cf3707774656fa1be81078':
ljpeg: use the correct number of components in yuv
Conflicts:
libavcodec/mjpegdec.c
See: b2e57eb5a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 11:25:46 +02:00
Michael Niedermayer
f57a7ac9b8
Merge commit '8aa3500905fec6c4e657bb291b861d43c34d3de9'
...
* commit '8aa3500905fec6c4e657bb291b861d43c34d3de9':
mjpeg: Validate sampling factors
Conflicts:
libavcodec/mjpegdec.c
See: 08c37a10e9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 10:50:03 +02:00
Kostya Shishkov
03ece7b040
proresdec: simplify slice component offsets handling
2013-05-21 09:58:59 +02:00
Luca Barbato
cfbd98abe8
mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac
...
Prevent out of buffer write when decoding broken samples.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-21 09:46:02 +02:00
Luca Barbato
a030279a67
ljpeg: use the correct number of components in yuv
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-20 22:02:05 +02:00
Luca Barbato
8aa3500905
mjpeg: Validate sampling factors
...
They must be non-zero.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-20 22:02:05 +02:00
Michael Niedermayer
2211c76287
smacker: remove av_clip_int16()
...
Fixes Ticket2425
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 21:45:40 +02:00
Michael Niedermayer
2187600f47
libx264: silence: warning: the address of val will always evaluate as true
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 16:39:00 +02:00