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
AgeCommit message (Collapse)Author
2014-06-01avcodec/mjpegdec: request a AMV sample with non mod 16 heightMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-28avcodec/mjpegdec: Support pix_fmt_id== 0x42111100Michael Niedermayer
Fixes: 538782_300.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-08avcodec/mjpegdec: zero gb to silence warning about it being possibly ↵Michael Niedermayer
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>
2014-04-30avcodec/mjpegdec: use av_mallocz_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-28avcodec/mjpegdec: make type of shift unsigned to avoid undefined behaviorMichael Niedermayer
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-27avcodec/mjpegdec: Fix undefined shiftMichael Niedermayer
Fixes CID1194388 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-24Use correct msvc type specifiers for ptrdiff_t and size_t.Carl Eugen Hoyos
The Windows runtime aborts if it finds %t or %z. Fixes ticket #3472. Reviewed-by: Ronald Bultje
2014-04-18mjpeg: cosmetics: indentationJustin Ruggles
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-04-18mjpeg: Do not fail jpeg decoding on bad EXIF data.Justin Ruggles
It is not required to correctly decode the image. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-04-05lavc/exif: Make EXIF IFD decoding part of private API/ABI.Thilo Borgmann
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01avcodec/jpeglsdec: add PAL8 supportMichael Niedermayer
Fixes Ticket3478 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01avcodec/mjpegdec: fix cmyk 420 with adobe_transform == 2Michael Niedermayer
Fixes Ticket3516 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31avcodec/mjpegdec: support subsampled 420 CMYKMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31avcodec/mjpegdec: upgrade upscale_v to support multiple planesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31avcodec/mjpegdec: upgrade upscale_h to support multiple planesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19avcodec/mjpegdec: Switch default interlaced polarity for MJPG to 1Michael Niedermayer
Fixes Ticket3229 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19avcodec/mjpegdec: parse avid data from extradataMichael Niedermayer
Makes no difference for any file tested but is needed for following bug-fix Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19avcodec/mjpeg: print info from parse_avid() if requestedMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19avcodec/mjpegdec: switch interlaced_polarity to 0 for PAL AVIDMichael Niedermayer
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>
2014-03-19avcodec/mjpegdec: factorize parse_avid outMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11avcodec/mjpegdec: support adob transform 2Michael Niedermayer
Fixes Ticket3426 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-28avcodec/mjpegdec: convert CMYK to GBRAPMichael Niedermayer
Fixes Ticket2799 This should be moved into swscale once we have a CMYK pixel format Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-28avcodec/mjpegdec: fix decoding 4th planeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-27avcodec/mjpegdec: Print error in case of CMYKMichael Niedermayer
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>
2014-02-27avcodec/mjpegdec: parse adobe_transformMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-27avcodec/mjpegdec: Print human readable string for APPxMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-01avcodec/mjpegdec: use the correct linesize in the flipping codeMichael Niedermayer
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>
2014-01-31avcodec/mjpegdec: pass into ff_mjpeg_decode_sos() and check bitmask sizeMichael Niedermayer
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>
2014-01-30avcodec/mjpegdec: use av_freep() instead of av_free()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30avcodec/mjpegdec Fix potential memleak of stereo3D at the end in case of ↵Michael Niedermayer
decoding failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30mjpegdec: parse JPS extension and save relevant stereo3d informationKirill Gavrilov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19avcodec/mjpegdec: Dont skip picture allocation if theres no picture allocatedMichael Niedermayer
Fixes Ticket 3245
2014-01-19avcodec/mjpegdec: Dont treat the lack of a startcode differently from end of ↵Michael Niedermayer
the bitstream Fixes Ticket3303 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19avcodec/mjpegdec: only run EOI emulation code when there was a scanMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19avcodec/mjpegdec: update cur_scan also for non-LS jpegMichael Niedermayer
This should make no difference but the variable will be used in a subsequent commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-10avcodec/mjpegdec: allow lowres with amvMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-10avcodec/mjpegdec: use the AVFrame width/height for flippingMichael Niedermayer
This makes it possible to use the code with lowres Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-10avcodec/mjpegdec: remove new flipping codeMichael Niedermayer
It stored images wrong in the user provided buffers (that is you would end up with a wrongly flipped image if you used direct rendering). Also it used wrong dimensions as noticed by ubitux Enable the old code unconditionally so flipping works correctly again. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-09Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mjpegdec: apply flipping after decoding, not before Conflicts: libavcodec/mjpegdec.c libavcodec/mjpegdec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-09mjpegdec: apply flipping after decoding, not beforeAnton Khirnov
This is simpler and removes a silly restriction on edges being present.
2013-12-13avcodec/mjpegdec: use mallocz for progressive blocksMichael Niedermayer
Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f849c599487_6828_mjpeg.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'Michael Niedermayer
* commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5': mjpegdec: use the AVFrame API properly. Conflicts: libavcodec/mjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09Add support for picture_ptr field in MJpegDecodeContextanatoly
Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit e0e3b8b297bae5144f23fd4b46a1309857040b63) Conflicts: libavcodec/jpeglsdec.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09mjpegdec: use the AVFrame API properly.Anton Khirnov
2013-11-22avcodec/mjpegdec: check len in mjpeg_decode_app() more completelyMichael Niedermayer
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>
2013-11-01Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089'Michael Niedermayer
* 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>
2013-10-31mjpegdec: stop using deprecated avcodec_set_dimensionsAnton Khirnov
2013-10-04Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'Michael Niedermayer
* 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>
2013-10-04cosmetics: Group .name and .long_name together in codec/format declarationsDiego Biurrun
2013-09-17avcodec/mjpegdec: Fix ljpeg RCTMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>