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 ' cfbd98abe8'
...
* commit 'cfbd98abe8 ':
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 ' a030279a67'
...
* commit 'a030279a67 ':
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 ' 8aa3500905'
...
* commit '8aa3500905 ':
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
Michael Niedermayer
f099cdaba3
avcodec/ratecontrol: silence "warning: expected_bits may be used uninitialized in this function"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 15:49:49 +02:00
Michael Niedermayer
d61681f9e9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: unref old current_picture before allocating a new one
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 12:07:17 +02:00
Michael Niedermayer
c5e11e897a
Merge commit ' db347280eb'
...
* commit 'db347280eb ':
vorbis: fallback to normal division instead of crashing
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 12:02:18 +02:00
Michael Niedermayer
ed113d7a6b
Merge commit ' ddf1b4a2f8'
...
* commit 'ddf1b4a2f8 ':
vorbis: simplify the inner loop in setup_classifs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 11:42:03 +02:00
Michael Niedermayer
aef044d215
Merge commit ' 36f1038004'
...
* commit '36f1038004 ':
vorbis: use normal integer values for iterators
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 11:28:21 +02:00
Michael Niedermayer
fbba76e89d
Merge commit ' 98186578a2'
...
* commit '98186578a2 ':
vorbis: refactor vorbis_residue_decode_internal
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 10:58:43 +02:00
Michael Niedermayer
faac955d9b
Merge commit ' c360fb174b'
...
* commit 'c360fb174b ':
win32: Do not use GetProcAddress when compiled for Vista+
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20 10:52:19 +02:00
Janne Grunau
4b79668154
mpegvideo: unref old current_picture before allocating a new one
...
Allows decoding with only three frame buffers with frame reference
counting. Fixes VAAPI based decoding in vlc which uses only three
frame buffers for the mpegvideo-based codecs.
2013-05-19 23:02:35 +02:00
Luca Barbato
db347280eb
vorbis: fallback to normal division instead of crashing
...
The use of ff_inverse speeds up slightly arches + compilers that
do not provide a division faster than the whole machinery, such
as ppc32 + gcc4.7, but has operational limits.
Drop the always-enable assert and provide a fallback.
2013-05-19 22:56:37 +02:00
Luca Barbato
ddf1b4a2f8
vorbis: simplify the inner loop in setup_classifs
2013-05-19 22:56:37 +02:00
Luca Barbato
36f1038004
vorbis: use normal integer values for iterators
...
No need to use fixed-size integers.
2013-05-19 22:56:37 +02:00
Luca Barbato
98186578a2
vorbis: refactor vorbis_residue_decode_internal
2013-05-19 22:56:37 +02:00
Michael Niedermayer
73b9f31c74
mjpeg_decode_com: remove redundant len checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 18:09:57 +02:00
Piotr Bandurski
2f75dcdc1c
mjpegdec: Fix field orderforinterlacedAVDJand AVRN in ntsc mode
...
Fixes ticket1656
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 18:09:57 +02:00
Jean-Baptiste Kempf
c360fb174b
win32: Do not use GetProcAddress when compiled for Vista+
...
Instead link directly to the condition variable functions.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-19 18:22:39 +03:00
Michael Niedermayer
a3264b4ba1
ffv1dec: defuse membomb
...
Fixes Ticket2589
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 13:56:13 +02:00
Michael Niedermayer
3e3514bce2
Merge commit ' ed50673066'
...
* commit 'ed50673066 ':
wavpack: validate samples size parsed in wavpack_decode_block
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 10:38:08 +02:00
Michael Niedermayer
2ad415cfa4
Merge commit ' 8c34558131'
...
* commit '8c34558131 ':
wavpack: return meaningful errors
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 10:22:05 +02:00
Michael Niedermayer
02788d2ac5
Merge commit ' 0f689a3d97'
...
* commit '0f689a3d97 ':
wavpack: K&R formatting cosmetics
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19 10:10:00 +02:00
Carl Eugen Hoyos
e32bbd4112
proresdec2: Only try to decode alpha plane if four output planes were allocated.
...
Fixes a crash with MPlayer.
2013-05-19 01:48:39 +02:00
Luca Barbato
ed50673066
wavpack: validate samples size parsed in wavpack_decode_block
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-18 20:39:32 +02:00
Luca Barbato
8c34558131
wavpack: return meaningful errors
...
And forward those that were already meaningful.
2013-05-18 20:37:18 +02:00
Christophe Gisquet
f49564c607
fmtconvert: int32_t input to int32_to_float_fmul_scalar
...
It was previously declared as int.
Does not change fate results for x86.
Conflicts:
libavcodec/ppc/fmtconvert_altivec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 18:01:16 +02:00
Luca Barbato
0f689a3d97
wavpack: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-18 17:19:43 +02:00
Kostya Shishkov
d13fa0e995
proresdec2: Support decoding transparency information.
...
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-05-18 16:48:34 +02:00
Michael Niedermayer
5e29e91232
avcodec_align_dimensions2: add missing yuva formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 16:21:09 +02:00
Michael Niedermayer
ed0aed09e8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Escape 130 (RPL) decoder
Conflicts:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/codec_desc.c
libavcodec/escape130.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 14:31:01 +02:00
Michael Niedermayer
849bb62c2c
Merge commit ' cebdedca57'
...
* commit 'cebdedca57 ':
prores: decode alpha plane when it's present
avfilter: check a malloc in avfilter_link().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 13:41:47 +02:00
Michael Niedermayer
20f75a810c
Merge commit ' 006ec64877'
...
* commit '006ec64877 ':
lavr doxy: add version.h to the lavr group
lavc doxy: add avcodec.h to the libavcodec group.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 11:25:58 +02:00
Michael Niedermayer
0718f0cc24
Merge commit ' bc8c1cdc7b'
...
* commit 'bc8c1cdc7b ':
lavfi doxy: add a page for lavfi.
jpegls: check the scan offset
Conflicts:
libavcodec/jpeglsdec.c
libavfilter/avfilter.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 11:04:11 +02:00
Michael Niedermayer
7d84bb2bcc
Merge commit ' 4a4107b489'
...
* commit '4a4107b489 ':
jpegls: factorize return paths
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 10:22:39 +02:00
Michael Niedermayer
b53d6a47c5
Merge commit ' a5a0ef5e13'
...
* commit 'a5a0ef5e13 ':
jpegls: return meaningful errors
sparc: VIS mnemonics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 10:05:00 +02:00
Eli Friedman
350914fc80
Escape 130 (RPL) decoder
...
Some fixes provided by Paul B Mahol <onemda@gmail.com>
and Michael Niedermayer <michaelni@gmx.at> and me.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2013-05-18 07:12:56 +02:00
Kostya Shishkov
cebdedca57
prores: decode alpha plane when it's present
2013-05-18 07:11:34 +02:00
Anton Khirnov
f0cebf51dd
lavc doxy: add avcodec.h to the libavcodec group.
2013-05-17 20:27:38 +02:00
Luca Barbato
4a4107b489
jpegls: factorize return paths
2013-05-17 16:44:13 +02:00
Luca Barbato
a5a0ef5e13
jpegls: return meaningful errors
2013-05-17 16:44:13 +02:00
Luca Barbato
abad374909
jpegls: check the scan offset
...
Prevent an out of array bound write.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-17 16:44:13 +02:00