summaryrefslogtreecommitdiff
path: root/libavcodec/mjpegdec.c
Commit message (Collapse)AuthorAge
* avcodec/mjpegdec: factorize some parts of the pix_fmt_id switch()Michael Niedermayer2014-07-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mjpegdec: handle luma upscale detection genericallyMichael Niedermayer2014-07-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mjpegdec: set upscale_h/upscale_v using generic code instead of ↵Michael Niedermayer2014-07-01
| | | | | | | | hardcoding a list Some code is left to handle corner cases Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mjpegdec: Support pix_fmt_id==0x11222200Michael Niedermayer2014-07-01
| | | | | | Fixes: 4858286_300.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mjpegdec: fix width for non chroma in rescalingMichael Niedermayer2014-07-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mjpegdec: Support pix_fmt_id == 0x22112200Michael Niedermayer2014-07-01
| | | | | | Fixes 4780490_300.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'Michael Niedermayer2014-07-01
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e3fcb14347466095839c2a3c47ebecff02da891e': dsputil: Split off IDCT bits into their own context Conflicts: configure libavcodec/aic.c libavcodec/arm/Makefile libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/asvdec.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dvdec.c libavcodec/dxva2_mpeg2.c libavcodec/intrax8.c libavcodec/mdec.c libavcodec/mjpegdec.c libavcodec/mjpegenc_common.h libavcodec/mpegvideo.c libavcodec/ppc/dsputil_altivec.h libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/idctdsp.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split off IDCT bits into their own contextDiego Biurrun2014-06-30
| |
| * mjpegdec: Properly set the context colorspace infoDerek Buitenhuis2014-06-24
| | | | | | | | | | | | The JPEG spec requires it to be this. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | mjpegdec: Properly set the context colorspace infoDerek Buitenhuis2014-06-24
| | | | | | | | | | | | The JPEG spec requires it to be this. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'Michael Niedermayer2014-06-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2': Add av_image_check_sar() and use it to validate SAR Conflicts: libavcodec/dpx.c libavcodec/dvdec.c libavcodec/ffv1dec.c libavcodec/utils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add av_image_check_sar() and use it to validate SARJustin Ruggles2014-06-20
| |
* | Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'Michael Niedermayer2014-06-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9': dsputil: Split clear_block*/fill_block* off into a separate context Conflicts: configure libavcodec/asvdec.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dsputil.h libavcodec/eamad.c libavcodec/intrax8.c libavcodec/mjpegdec.c libavcodec/ppc/dsputil_ppc.c libavcodec/vc1dec.c libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split clear_block*/fill_block* off into a separate contextDiego Biurrun2014-06-18
| |
| * mjpeg: set color_rangeVittorio Giovara2014-03-16
| |
* | avcodec/mjpegdec: Improve intel jpeg flip heuristicMichael Niedermayer2014-06-06
| | | | | | | | | | | | Fixes Ticket3698 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: request a AMV sample with non mod 16 heightMichael Niedermayer2014-06-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Support pix_fmt_id== 0x42111100Michael Niedermayer2014-05-28
| | | | | | | | | | Fixes: 538782_300.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: zero gb to silence warning about it being possibly ↵Michael Niedermayer2014-05-08
| | | | | | | | | | | | | | | | uninitialized The code is not speed relevant, also its more robust if the pointers are NULL instead of random. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: use av_mallocz_array()Michael Niedermayer2014-04-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: make type of shift unsigned to avoid undefined behaviorMichael Niedermayer2014-04-28
| | | | | | | | | | Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Fix undefined shiftMichael Niedermayer2014-04-27
| | | | | | | | | | | | Fixes CID1194388 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Use correct msvc type specifiers for ptrdiff_t and size_t.Carl Eugen Hoyos2014-04-24
| | | | | | | | | | | | | | The Windows runtime aborts if it finds %t or %z. Fixes ticket #3472. Reviewed-by: Ronald Bultje
* | mjpeg: cosmetics: indentationJustin Ruggles2014-04-18
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | mjpeg: Do not fail jpeg decoding on bad EXIF data.Justin Ruggles2014-04-18
| | | | | | | | | | | | It is not required to correctly decode the image. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | lavc/exif: Make EXIF IFD decoding part of private API/ABI.Thilo Borgmann2014-04-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeglsdec: add PAL8 supportMichael Niedermayer2014-04-01
| | | | | | | | | | | | Fixes Ticket3478 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: fix cmyk 420 with adobe_transform == 2Michael Niedermayer2014-04-01
| | | | | | | | | | | | Fixes Ticket3516 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: support subsampled 420 CMYKMichael Niedermayer2014-03-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: upgrade upscale_v to support multiple planesMichael Niedermayer2014-03-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: upgrade upscale_h to support multiple planesMichael Niedermayer2014-03-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Switch default interlaced polarity for MJPG to 1Michael Niedermayer2014-03-19
| | | | | | | | | | | | Fixes Ticket3229 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: parse avid data from extradataMichael Niedermayer2014-03-19
| | | | | | | | | | | | | | Makes no difference for any file tested but is needed for following bug-fix Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpeg: print info from parse_avid() if requestedMichael Niedermayer2014-03-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: switch interlaced_polarity to 0 for PAL AVIDMichael Niedermayer2014-03-19
| | | | | | | | | | | | | | 0 should have been the default, this change should make no difference but this is needed for the following bugfix Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: factorize parse_avid outMichael Niedermayer2014-03-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: support adob transform 2Michael Niedermayer2014-03-11
| | | | | | | | | | | | Fixes Ticket3426 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: convert CMYK to GBRAPMichael Niedermayer2014-02-27
| | | | | | | | | | | | | | | | Fixes Ticket2799 This should be moved into swscale once we have a CMYK pixel format Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: fix decoding 4th planeMichael Niedermayer2014-02-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Print error in case of CMYKMichael Niedermayer2014-02-27
| | | | | | | | | | | | | | | | | | | | | | Also fail if AV_EF_EXPLODE is set. We do not fail by default, but rather return some image as it may be usefull to the end user to see what is on the image, for example text could be read quite fine and objects recognized. Possibly fixes Ticket3424 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: parse adobe_transformMichael Niedermayer2014-02-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Print human readable string for APPxMichael Niedermayer2014-02-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: use the correct linesize in the flipping codeMichael Niedermayer2014-01-31
| | | | | | | | | | | | | | | | | | | | Fixes out of array access No releases should be affected Depends on 7c3700cd1d8683966b21fffbf02e326d0bd14e06, do not backport without this one Fixes: asan_heap-oob_14a37fe_9111_cov_1692584941_test4.amv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: pass into ff_mjpeg_decode_sos() and check bitmask sizeMichael Niedermayer2014-01-31
| | | | | | | | | | | | | | Fixes: heap array overread Fixes: asan_heap-oob_149b2bc_6577_m1.mxg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: use av_freep() instead of av_free()Michael Niedermayer2014-01-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec Fix potential memleak of stereo3D at the end in case of ↵Michael Niedermayer2014-01-30
| | | | | | | | | | | | decoding failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: parse JPS extension and save relevant stereo3d informationKirill Gavrilov2014-01-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Dont skip picture allocation if theres no picture allocatedMichael Niedermayer2014-01-19
| | | | | | | | Fixes Ticket 3245
* | avcodec/mjpegdec: Dont treat the lack of a startcode differently from end of ↵Michael Niedermayer2014-01-19
| | | | | | | | | | | | | | | | the bitstream Fixes Ticket3303 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: only run EOI emulation code when there was a scanMichael Niedermayer2014-01-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>