summaryrefslogtreecommitdiff
path: root/libavcodec/mjpegdec.c
Commit message (Collapse)AuthorAge
* avcodec/mjpegdec: check len in mjpeg_decode_app() more completelyMichael Niedermayer2013-11-22
| | | | | | | | | Avoids len from becoming negative and causing assertion failure Fixes: signal_sigabrt_7ffff7126425_5140_fd44dc63fa7bdd12ee34fc602231ef02.jpg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089'Michael Niedermayer2013-11-01
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '13207484bba8a8b78b40d5a22da8c9c555429089': mpeg4video_parser: stop using deprecated avcodec_set_dimensions mpeg12dec: stop using deprecated avcodec_set_dimensions mjpegdec: stop using deprecated avcodec_set_dimensions libvpxdec: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4video_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegdec: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-31
| |
* | Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'Michael Niedermayer2013-10-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2': cosmetics: Group .name and .long_name together in codec/format declarations Conflicts: libavcodec/8svx.c libavcodec/alac.c libavcodec/cljr.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dpxenc.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/ffv1dec.c libavcodec/flacdec.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g726.c libavcodec/gif.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopencore-amr.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/libvo-amrwbenc.c libavcodec/libvorbisenc.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/ljpegenc.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/proresdec_lgpl.c libavcodec/proresenc_kostya.c libavcodec/ra144enc.c libavcodec/rawdec.c libavcodec/rv10.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tta.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/wavpack.c libavcodec/xbmenc.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Group .name and .long_name together in codec/format declarationsDiego Biurrun2013-10-03
| |
* | avcodec/mjpegdec: Fix ljpeg RCTMichael Niedermayer2013-09-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: rgba64 ljpeg supportMichael Niedermayer2013-09-16
| | | | | | | | | | | | Fixes Ticket2965 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: change error return value to be outside the 16bit rangeMichael Niedermayer2013-09-16
| | | | | | | | | | | | Fixes part of Ticket2965 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Fix rgb48 ljpegMichael Niedermayer2013-09-15
| | | | | | | | | | | | Fixes Ticket894 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: check for malloc failure of blocks[] and last_nnz[]Michael Niedermayer2013-09-13
| | | | | | | | | | | | | | Fixes null pointer dereference Fixes Ticket2947 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Support >8bpc color mjpegMichael Niedermayer2013-09-11
| | | | | | | | | | | | Fixes Ticket2939 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: fix shift_output() with lowresMichael Niedermayer2013-09-09
| | | | | | | | | | | | Fixes Ticket2940 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: support >8bit in mjpeg_decode_scan_progressive_ac()Michael Niedermayer2013-09-06
| | | | | | | | | | | | Fixes Ticket2812 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: move shift_output() to its own functionMichael Niedermayer2013-09-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: 12bit Grayscale supportMichael Niedermayer2013-09-06
| | | | | | | | | | | | Fixes part of Ticket2812 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Fix normal jpeg with bits < 8Michael Niedermayer2013-09-06
| | | | | | | | | | | | Untested due to lack of testcase Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec fix last_dc for bits != 8Michael Niedermayer2013-09-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Simplify masking in ljpeg_decode_yuv_scan()Michael Niedermayer2013-09-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: fix rgb ljpeg prediction 5/6/7 with point_transformMichael Niedermayer2013-09-05
| | | | | | | | | | | | untested due to lack of sample Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: fix yuv ljpeg prediction 5/6/7 with point transformsMichael Niedermayer2013-09-05
| | | | | | | | | | | | Fixes Ticket2826 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: make "unknown colorspace" error more informativeMichael Niedermayer2013-09-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Add some sanity checks to ljpeg_decode_rgb_scan()Michael Niedermayer2013-09-05
| | | | | | | | | | | | | | These prevent the rgb ljpeg code from being run on parameters that it doesnt support. No testcase available but it seems possible to trigger these. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'af11fa5409cc72fc45ca7f3527400beca10967b9'Michael Niedermayer2013-09-04
|\| | | | | | | | | | | | | | | | | | | | | * commit 'af11fa5409cc72fc45ca7f3527400beca10967b9': mjpegb: Detect changing number of planes in interlaced video Conflicts: libavcodec/mjpegdec.c See: ecc31630f9a16ead4272a078c281afcb4db87f21 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegb: Detect changing number of planes in interlaced videoMichael Niedermayer2013-09-03
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
| * avcodec: Remove some commented-out debug cruftDiego Biurrun2013-08-20
| |
* | avcodec/mjpegdec: fix overread in find_marker()Michael Niedermayer2013-08-23
| | | | | | | | | | Found-by: Laurent Butti <laurentb@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: print a message when there was just a single field and no ↵Michael Niedermayer2013-08-14
| | | | | | | | | | | | | | | | frame Fixes ticket1915 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Read EXIF metadata in JPEG input.Thilo Borgmann2013-08-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Set bits_per_raw_sample when decoding mjpeg / ljpeg.Carl Eugen Hoyos2013-07-28
| | | | | | | | | | The ljpeg decoder also supports gray images with 8 - 15 bits per component.
* | avcodec/mjpegdec: Support RGBA lpegsMichael Niedermayer2013-07-25
| | | | | | | | | | | | Fixes Ticket896 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: print length too in APPx debug codeMichael Niedermayer2013-07-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: parse app-xfrmMichael Niedermayer2013-07-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: parse app-colrMichael Niedermayer2013-07-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: Fix used quant index for gbrMichael Niedermayer2013-07-11
| | | | | | | | | | | | Fixes Ticket1651 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: initialize source variables before gbr remapMichael Niedermayer2013-07-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpegdec: clear EOBRUN on restartsMichael Niedermayer2013-07-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpegdec: give handle_rstn() a return code that indicates if restart did happenMichael Niedermayer2013-07-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpeg_decode_scan: reset restart stateMichael Niedermayer2013-07-09
| | | | | | | | | | | | | | Fixes Ticket2082 Fixes progressive/refinement + restart jpegs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-30
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mjpeg: Check the unescaped size for overflows Conflicts: libavcodec/mjpegdec.c See: a9456c7c5ca883b5a3947e59a9fba5587e18e119 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpeg: Check the unescaped size for overflowsLuca Barbato2013-06-30
| | | | | | | | | | | | | | | | And contextually check init_get_bits success and fix the reporting message. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '7520d9779c6d30b385df5a0a42da508238076192'Michael Niedermayer2013-06-30
|\| | | | | | | | | | | | | | | | | | | * commit '7520d9779c6d30b385df5a0a42da508238076192': mjpeg: Move code out of else branch Conflicts: libavcodec/mjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpeg: Move code out of else branchLuca Barbato2013-06-30
| | | | | | | | Simplify the control flow and spare some vertical space.
* | mjpeg_decode_dc: check code before using it in get_xbits()Michael Niedermayer2013-06-30
| | | | | | | | | | | | Fixes undefined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: fix AV_PIX_FMT_YUVJ411P handlingMichael Niedermayer2013-05-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8'Michael Niedermayer2013-05-21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8': mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac Conflicts: libavcodec/mjpegdec.c See: 1f41cffe1e3e79620f587545bdfcbd7e6e68ed29 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegdec: validate parameters in mjpeg_decode_scan_progressive_acLuca Barbato2013-05-21
| | | | | | | | | | | | | | Prevent out of buffer write when decoding broken samples. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'a030279a67ef883df8cf3707774656fa1be81078'Michael Niedermayer2013-05-21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a030279a67ef883df8cf3707774656fa1be81078': ljpeg: use the correct number of components in yuv Conflicts: libavcodec/mjpegdec.c See: b2e57eb5a3cb9d5dfab601077fa0edee91e06ca5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ljpeg: use the correct number of components in yuvLuca Barbato2013-05-20
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '8aa3500905fec6c4e657bb291b861d43c34d3de9'Michael Niedermayer2013-05-21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '8aa3500905fec6c4e657bb291b861d43c34d3de9': mjpeg: Validate sampling factors Conflicts: libavcodec/mjpegdec.c See: 08c37a10e9ef7e30d7b7a889ad28c7fa9c49c886 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpeg: Validate sampling factorsLuca Barbato2013-05-20
| | | | | | | | | | | | | | They must be non-zero. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 12:30:00 +0000