Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavcodec/mjpegdec.c
AgeCommit message (Collapse)Author
2015-08-24avcodec/mjpegdec: Remove message asking for a non mod 16 AMV sampleMichael Niedermayer
Ticket4770 contains such a sample and it decodes fine Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-17lavc/mjpegdec: Detect more CMYK images.Carl Eugen Hoyos
Fixes ticket #4772.
2015-08-11lavc: Remove newline from avpriv_request_sample() calls.Carl Eugen Hoyos
2015-07-28Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer
* commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: Consistently prefix input buffer definesVittorio Giovara
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27lavc: AV-prefix all codec capabilitiesVittorio Giovara
Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-16lavc: Add properties field to AVCodecContext.Carl Eugen Hoyos
The new field can hold information about losslessness and closed captions for now.
2015-07-15avcodec/mjpegdec: Fix DC overflow in decode_block()Michael Niedermayer
Fixes Ticket4683 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-02avcodec/mjpegdec: Reorder operations to avoid undefined behaviorMichael Niedermayer
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>
2015-06-30avcodec/mjpegdec: Fix small picture upscaleMichael Niedermayer
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>
2015-06-21avcodec/mjpegdec: dont try to combine fields for decimated multiscope 2 materialMichael Niedermayer
Fixes Ticket4535 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-13avcodec/mjpegdec: fix len computation in ff_mjpeg_decode_dqt()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-13avcodec/mjpegdec: Check len in ff_mjpeg_decode_dht()Michael Niedermayer
Fixes CID1239167 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-13avcodec/mjpegdec: Check len in ff_mjpeg_decode_dqt()Michael Niedermayer
Fixes CID1239060 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'Michael Niedermayer
* 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>
2015-04-19lavc: Replace av_dlog and tprintf with internal macrosVittorio Giovara
2015-03-31Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'Michael Niedermayer
* commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8': build: Split JPEG-related tables off into a separate component Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30Merge commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80'Michael Niedermayer
* 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>
2015-03-30build: Split JPEG-related tables off into a separate componentDiego Biurrun
2015-03-30mjpeg: Move code only used in the encoder(s) to the appropriate headerDiego Biurrun
2015-03-19avcodec/mjpegdec: Support 31111100 samplingMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-19avcodec/mjpegdec: Change upscale_* to an array instead of a bitmaskMichael Niedermayer
This allows storing integer factors instead of just 0 and 1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-14Merge commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2'Michael Niedermayer
* 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>
2015-03-13mjpeg: Mark decoder family as thread safeVittorio Giovara
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.
2015-02-11avcodec/mjpegdec: Skip blocks which are outside the visible areaMichael Niedermayer
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>
2015-02-04avcodec/mjpegdec: Check number of components for JPEG-LSMichael Niedermayer
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>
2015-02-04avcodec/mjpegdec: Check escape sequence validityMichael Niedermayer
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>
2014-12-19Merge commit '809c3023b699c54c90511913d3b6140dd2436550'Michael Niedermayer
* commit '809c3023b699c54c90511913d3b6140dd2436550': mjpegdec: check for pixel format changes Conflicts: libavcodec/mjpegdec.c See: 5c378d6a6df8243f06c87962b873bd563e58cd39 See: a2f680c7bc7642c687aeb4e14d00ac74833c7a09 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19mjpegdec: check for pixel format changesAnton Khirnov
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
2014-11-27avcodec/mjpegdec: Fix integer overflow in shiftMichael Niedermayer
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>
2014-11-25avcodec/mjpegdec: Fix context fields becoming inconsistentMichael Niedermayer
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>
2014-11-25avcodec/mjpegdec: Add YUVA420 formats to *scale assertsMichael Niedermayer
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>
2014-11-25avcodec/mjpegdec: Print the number of bits in the unsupported pixel format errorMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-25avcodec/mjpegdec: Check for pixfmtid 0x42111100 || 0x24111100 with more than ↵Michael Niedermayer
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>
2014-11-22avcodec/mjpegdec: fix pixfmtid 0x14111100Michael Niedermayer
Fixes part of Ticket 2004 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-18avcodec/mjpegdec: Support some subsampled GBR variantsMichael Niedermayer
Fixes Ticket4045 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-07avcodec/mjpegdec: support pix fmt id 0x22111111Michael Niedermayer
Fixes: 4163724_300.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06Merge commit '199d9f995da53fe2507821f6d96bbc692574e1a9'Michael Niedermayer
* commit '199d9f995da53fe2507821f6d96bbc692574e1a9': mjpegdec: fix undefined shift Conflicts: libavcodec/mjpegdec.c See: b4329605289e25bb071ec1c1182bf25fc83b09aa Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06mjpegdec: fix undefined shiftVittorio Giovara
Add a comment to explain the code. CC: libav-stable@libav.org Bug-Id: CID 1194388
2014-10-22avcodec/mjpegdec: use FF_CEIL_RSHIFT() for widthMichael Niedermayer
No testcase known Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21avcodec/mjpegdec: simplify chroma_height calculationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21avcodec/mjpegdec: Support 24111100 pix fmt idMichael Niedermayer
Fixes 129533924_640.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-12avcodec/mjpegdec: sanity check bitsMichael Niedermayer
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>
2014-10-03avcodec/mjpegdec: check bits per pixel for changes similar to dimensionsMichael Niedermayer
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>
2014-09-13avcodec/mjpegdec: Fix chroma width roundingClément Bœsch
Fixes vertical line at the right side Fixes Ticket 3929 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-06avcodec/mjpegdec: fix rounding of chroma_heightMichael Niedermayer
Fixes green line at the bottom Fixes Ticket3913 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-31avcodec/mjpegdec: fix green line at the bottom with upscale vMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-31avcodec/mjpegdec: fix green vertical line at the right with upscale hMichael Niedermayer
Fixes Ticket3891 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14avcodec/mjpegdec: Support AV_PIX_FMT_YUV420P16 with upscale_hMichael Niedermayer
Fixes assertion failure Fixes: test42f.jpg Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 18:17:47 +0300