summaryrefslogtreecommitdiff
path: root/libavcodec/mjpegdec.c
Commit message (Collapse)AuthorAge
* avcodec/mjpegdec: Fix small picture upscaleMichael Niedermayer2015-06-30
| | | | | | | | | Fixes out of array access Fixes: asan_heap-oob_1dd60fd_267_cov_2954683513_5baad44ca4702949724234e35c5bb341.jpg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mjpegdec: dont try to combine fields for decimated multiscope 2 materialMichael Niedermayer2015-06-21
| | | | | | Fixes Ticket4535 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mjpegdec: fix len computation in ff_mjpeg_decode_dqt()Michael Niedermayer2015-05-13
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mjpegdec: Check len in ff_mjpeg_decode_dht()Michael Niedermayer2015-05-13
| | | | | | Fixes CID1239167 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mjpegdec: Check len in ff_mjpeg_decode_dqt()Michael Niedermayer2015-05-13
| | | | | | Fixes CID1239060 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'Michael Niedermayer2015-04-20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25': lavc: Replace av_dlog and tprintf with internal macros Conflicts: libavcodec/aacdec.c libavcodec/audio_frame_queue.c libavcodec/bitstream.c libavcodec/dcadec.c libavcodec/dnxhddec.c libavcodec/dvbsubdec.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/get_bits.h libavcodec/gifdec.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/imc.c libavcodec/interplayvideo.c libavcodec/jpeglsdec.c libavcodec/libopencore-amr.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_parser.c libavcodec/pngdec.c libavcodec/ratecontrol.c libavcodec/rv10.c libavcodec/svq1dec.c libavcodec/vqavideo.c libavcodec/wmadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Replace av_dlog and tprintf with internal macrosVittorio Giovara2015-04-19
| |
* | Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'Michael Niedermayer2015-03-31
|\| | | | | | | | | | | | | | | | | | | * commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8': build: Split JPEG-related tables off into a separate component Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Split JPEG-related tables off into a separate componentDiego Biurrun2015-03-30
| |
* | Merge commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80'Michael Niedermayer2015-03-30
|\| | | | | | | | | | | | | | | | | | | * commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80': mjpeg: Move code only used in the encoder(s) to the appropriate header Conflicts: libavcodec/mjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpeg: Move code only used in the encoder(s) to the appropriate headerDiego Biurrun2015-03-30
| |
* | avcodec/mjpegdec: Support 31111100 samplingMichael Niedermayer2015-03-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Change upscale_* to an array instead of a bitmaskMichael Niedermayer2015-03-18
| | | | | | | | | | | | This allows storing integer factors instead of just 0 and 1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2'Michael Niedermayer2015-03-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2': mjpeg: Mark decoder family as thread safe Conflicts: libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mxpegdec.c libavcodec/sp5xdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpeg: Mark decoder family as thread safeVittorio Giovara2015-03-13
| | | | | | | | | | | | No global variables are used and the VLC tables are allocated without static elements. This will allow using a JPEG decoding context within other decoders.
* | avcodec/mjpegdec: Skip blocks which are outside the visible areaMichael Niedermayer2015-02-11
| | | | | | | | | | | | | | | | Fixes out of array accesses Fixes: ffmpeg_mjpeg_crash.avi Found-by: Thomas Lindroth <thomas.lindroth@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Check number of components for JPEG-LSMichael Niedermayer2015-02-04
| | | | | | | | | | | | | | | | Fixes out of array accesses Fixes: asan_heap-oob_1c1a4ea_1242_cov_2274415971_TESTcmyk.jpg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Check escape sequence validityMichael Niedermayer2015-02-04
| | | | | | | | | | | | | | | | Fixes assertion failure Fixes: asan_heap-oob_1c1a4ea_1242_cov_2274415971_TESTcmyk.jpg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '809c3023b699c54c90511913d3b6140dd2436550'Michael Niedermayer2014-12-19
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '809c3023b699c54c90511913d3b6140dd2436550': mjpegdec: check for pixel format changes Conflicts: libavcodec/mjpegdec.c See: 5c378d6a6df8243f06c87962b873bd563e58cd39 See: a2f680c7bc7642c687aeb4e14d00ac74833c7a09 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegdec: check for pixel format changesAnton Khirnov2014-12-19
| | | | | | | | | | | | | | | | | | | | Fixes possible invalid memory access. Based on code by Michael Niedermayer <michaelni@gmx.at> CC: libav-stable@libav.org Bug-ID: CVE-2014-8541 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | avcodec/mjpegdec: Fix integer overflow in shiftMichael Niedermayer2014-11-27
| | | | | | | | | | | | Fixes: signal_sigabrt_7ffff6ac7bb9_2683_cov_4120310995_m_ijpg.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Fix context fields becoming inconsistentMichael Niedermayer2014-11-25
| | | | | | | | | | | | | | Fixes out of array access Fixes: asan_heap-oob_1ca4f85_2760_cov_144449187_miss_congeniality_pegasus_ljpg.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Add YUVA420 formats to *scale assertsMichael Niedermayer2014-11-25
| | | | | | | | | | | | | | Fixes assertion failure Fixes: signal_sigabrt_7ffff6ac7bb9_2042_cov_2593130068_ef1f8a057bb6056674fad92f6b8c0acd.jpg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Print the number of bits in the unsupported pixel format errorMichael Niedermayer2014-11-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Check for pixfmtid 0x42111100 || 0x24111100 with more than ↵Michael Niedermayer2014-11-25
| | | | | | | | | | | | | | | | | | | | | | 8 bits These cases are not supported yet Fixes assertion failure Fixes: signal_sigabrt_7ffff6ac7bb9_1_cov_1553101927_00.jpg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: fix pixfmtid 0x14111100Michael Niedermayer2014-11-22
| | | | | | | | | | Fixes part of Ticket 2004 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Support some subsampled GBR variantsMichael Niedermayer2014-11-18
| | | | | | | | | | | | Fixes Ticket4045 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: support pix fmt id 0x22111111Michael Niedermayer2014-11-07
| | | | | | | | | | | | Fixes: 4163724_300.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '199d9f995da53fe2507821f6d96bbc692574e1a9'Michael Niedermayer2014-11-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '199d9f995da53fe2507821f6d96bbc692574e1a9': mjpegdec: fix undefined shift Conflicts: libavcodec/mjpegdec.c See: b4329605289e25bb071ec1c1182bf25fc83b09aa Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegdec: fix undefined shiftVittorio Giovara2014-11-06
| | | | | | | | | | | | | | Add a comment to explain the code. CC: libav-stable@libav.org Bug-Id: CID 1194388
* | avcodec/mjpegdec: use FF_CEIL_RSHIFT() for widthMichael Niedermayer2014-10-22
| | | | | | | | | | | | No testcase known Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: simplify chroma_height calculationMichael Niedermayer2014-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Support 24111100 pix fmt idMichael Niedermayer2014-10-21
| | | | | | | | | | | | Fixes 129533924_640.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: sanity check bitsMichael Niedermayer2014-10-12
| | | | | | | | | | | | | | | | Fixes undefined shift Fixes: asan_heap-oob_16668e9_2_asan_heap-oob_16668e9_346_miss_congeniality_pegasus_mjpg.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: check bits per pixel for changes similar to dimensionsMichael Niedermayer2014-10-03
| | | | | | | | | | | | | | | | Fixes out of array accesses Fixes: asan_heap-oob_16668e9_2_asan_heap-oob_16668e9_346_miss_congeniality_pegasus_mjpg.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Fix chroma width roundingClément Bœsch2014-09-13
| | | | | | | | | | | | | | Fixes vertical line at the right side Fixes Ticket 3929 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: fix rounding of chroma_heightMichael Niedermayer2014-09-06
| | | | | | | | | | | | | | Fixes green line at the bottom Fixes Ticket3913 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: fix green line at the bottom with upscale vMichael Niedermayer2014-08-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: fix green vertical line at the right with upscale hMichael Niedermayer2014-08-31
| | | | | | | | | | | | Fixes Ticket3891 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Support AV_PIX_FMT_YUV420P16 with upscale_hMichael Niedermayer2014-08-14
| | | | | | | | | | | | | | Fixes assertion failure Fixes: test42f.jpg Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: add pix_fmt: 0x14121200Przemysław Sobala2014-07-22
| | | | | | | | | | | | Fixes: _15801_F.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 12:43:17 +0000