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
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>
2013-09-16avcodec/mjpegdec: rgba64 ljpeg supportMichael Niedermayer
Fixes Ticket2965 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-16avcodec/mjpegdec: change error return value to be outside the 16bit rangeMichael Niedermayer
Fixes part of Ticket2965 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-16avcodec/mjpegdec: Fix rgb48 ljpegMichael Niedermayer
Fixes Ticket894 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-14avcodec/mjpegdec: check for malloc failure of blocks[] and last_nnz[]Michael Niedermayer
Fixes null pointer dereference Fixes Ticket2947 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11avcodec/mjpegdec: Support >8bpc color mjpegMichael Niedermayer
Fixes Ticket2939 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-09avcodec/mjpegdec: fix shift_output() with lowresMichael Niedermayer
Fixes Ticket2940 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06avcodec/mjpegdec: support >8bit in mjpeg_decode_scan_progressive_ac()Michael Niedermayer
Fixes Ticket2812 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06avcodec/mjpegdec: move shift_output() to its own functionMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06avcodec/mjpegdec: 12bit Grayscale supportMichael Niedermayer
Fixes part of Ticket2812 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06avcodec/mjpegdec: Fix normal jpeg with bits < 8Michael Niedermayer
Untested due to lack of testcase Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-06avcodec/mjpegdec fix last_dc for bits != 8Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05avcodec/mjpegdec: Simplify masking in ljpeg_decode_yuv_scan()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05avcodec/mjpegdec: fix rgb ljpeg prediction 5/6/7 with point_transformMichael Niedermayer
untested due to lack of sample Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05avcodec/mjpegdec: fix yuv ljpeg prediction 5/6/7 with point transformsMichael Niedermayer
Fixes Ticket2826 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05avcodec/mjpegdec: make "unknown colorspace" error more informativeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05avcodec/mjpegdec: Add some sanity checks to ljpeg_decode_rgb_scan()Michael Niedermayer
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>
2013-09-04Merge commit 'af11fa5409cc72fc45ca7f3527400beca10967b9'Michael Niedermayer
* commit 'af11fa5409cc72fc45ca7f3527400beca10967b9': mjpegb: Detect changing number of planes in interlaced video Conflicts: libavcodec/mjpegdec.c See: ecc31630f9a16ead4272a078c281afcb4db87f21 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-03mjpegb: Detect changing number of planes in interlaced videoMichael Niedermayer
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-23avcodec/mjpegdec: fix overread in find_marker()Michael Niedermayer
Found-by: Laurent Butti <laurentb@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-20avcodec: Remove some commented-out debug cruftDiego Biurrun
2013-08-14avcodec/mjpegdec: print a message when there was just a single field and no ↵Michael Niedermayer
frame Fixes ticket1915 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-13avcodec/mjpegdec: Read EXIF metadata in JPEG input.Thilo Borgmann
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-28Set bits_per_raw_sample when decoding mjpeg / ljpeg.Carl Eugen Hoyos
The ljpeg decoder also supports gray images with 8 - 15 bits per component.
2013-07-25avcodec/mjpegdec: Support RGBA lpegsMichael Niedermayer
Fixes Ticket896 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11mjpegdec: print length too in APPx debug codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11mjpegdec: parse app-xfrmMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11mjpegdec: parse app-colrMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11mjpegdec: Fix used quant index for gbrMichael Niedermayer
Fixes Ticket1651 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11mjpegdec: initialize source variables before gbr remapMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10jpegdec: clear EOBRUN on restartsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10jpegdec: give handle_rstn() a return code that indicates if restart did happenMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10mjpeg_decode_scan: reset restart stateMichael Niedermayer
Fixes Ticket2082 Fixes progressive/refinement + restart jpegs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mjpeg: Check the unescaped size for overflows Conflicts: libavcodec/mjpegdec.c See: a9456c7c5ca883b5a3947e59a9fba5587e18e119 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-30Merge commit '7520d9779c6d30b385df5a0a42da508238076192'Michael Niedermayer
* commit '7520d9779c6d30b385df5a0a42da508238076192': mjpeg: Move code out of else branch Conflicts: libavcodec/mjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-30mjpeg: Check the unescaped size for overflowsLuca Barbato
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
2013-06-30mjpeg: Move code out of else branchLuca Barbato
Simplify the control flow and spare some vertical space.
2013-06-30mjpeg_decode_dc: check code before using it in get_xbits()Michael Niedermayer
Fixes undefined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21mjpegdec: fix AV_PIX_FMT_YUVJ411P handlingMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21Merge commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8'Michael Niedermayer
* commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8': mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac Conflicts: libavcodec/mjpegdec.c See: 1f41cffe1e3e79620f587545bdfcbd7e6e68ed29 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21Merge commit 'a030279a67ef883df8cf3707774656fa1be81078'Michael Niedermayer
* commit 'a030279a67ef883df8cf3707774656fa1be81078': ljpeg: use the correct number of components in yuv Conflicts: libavcodec/mjpegdec.c See: b2e57eb5a3cb9d5dfab601077fa0edee91e06ca5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21Merge commit '8aa3500905fec6c4e657bb291b861d43c34d3de9'Michael Niedermayer
* commit '8aa3500905fec6c4e657bb291b861d43c34d3de9': mjpeg: Validate sampling factors Conflicts: libavcodec/mjpegdec.c See: 08c37a10e9ef7e30d7b7a889ad28c7fa9c49c886 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21mjpegdec: validate parameters in mjpeg_decode_scan_progressive_acLuca Barbato
Prevent out of buffer write when decoding broken samples. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-05-21ljpeg: use the correct number of components in yuvLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-05-21mjpeg: Validate sampling factorsLuca Barbato
They must be non-zero. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-05-19mjpeg_decode_com: remove redundant len checksMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-19mjpegdec: Fix field orderforinterlacedAVDJand AVRN in ntsc modePiotr Bandurski
Fixes ticket1656 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: sparc: Eliminate dead code in VIS acceleration macros flacdec: drop unnecessary assert mjpegdec: properly report unsupported disabled features Conflicts: libavcodec/flacdec.c libavcodec/mjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>