summaryrefslogtreecommitdiffstats
path: root/libavcodec/mjpegdec.h
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/mjpegdec: Change upscale_* to an array instead of a bitmaskMichael Niedermayer2015-03-181-2/+2
| | | | | | This allows storing integer factors instead of just 0 and 1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mjpegdec: simplify chroma_height calculationMichael Niedermayer2014-10-211-1/+0
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'Michael Niedermayer2014-07-011-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-301-2/+2
| |
* | Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'Michael Niedermayer2014-06-191-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-181-0/+2
| |
* | avcodec/jpeglsdec: add PAL8 supportMichael Niedermayer2014-04-011-0/+1
| | | | | | | | | | | | Fixes Ticket3478 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: parse adobe_transformMichael Niedermayer2014-02-271-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: pass into ff_mjpeg_decode_sos() and check bitmask sizeMichael Niedermayer2014-01-311-1/+2
| | | | | | | | | | | | | | 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>
* | mjpegdec: parse JPS extension and save relevant stereo3d informationKirill Gavrilov2014-01-301-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-091-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | * qatar/master: mjpegdec: apply flipping after decoding, not before Conflicts: libavcodec/mjpegdec.c libavcodec/mjpegdec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegdec: apply flipping after decoding, not beforeAnton Khirnov2014-01-091-0/+3
| | | | | | | | This is simpler and removes a silly restriction on edges being present.
* | Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'Michael Niedermayer2013-12-091-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5': mjpegdec: use the AVFrame API properly. Conflicts: libavcodec/mjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegdec: use the AVFrame API properly.Anton Khirnov2013-12-091-1/+1
| |
| * mjpeg: Use hpeldsp instead of dsputil for half-pel functionsRonald S. Bultje2013-04-191-0/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/mjpegdec: Read EXIF metadata in JPEG input.Thilo Borgmann2013-08-131-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: parse app-xfrmMichael Niedermayer2013-07-111-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: parse app-colrMichael Niedermayer2013-07-111-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: Fix used quant index for gbrMichael Niedermayer2013-07-111-0/+1
| | | | | | | | | | | | Fixes Ticket1651 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpeg: use hpeldsp instead of dsputil for half-pel functions.Ronald S. Bultje2013-03-131-0/+2
| |
* | Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer2013-01-231-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f': Drop DCTELEM typedef Conflicts: libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/motion_est_alpha.c libavcodec/arm/dsputil_init_armv6.c libavcodec/bfin/dsputil_bfin.h libavcodec/bfin/pixels_bfin.S libavcodec/cavs.c libavcodec/cavsdec.c libavcodec/dct-test.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/eamad.c libavcodec/h264_cavlc.c libavcodec/h264idct_template.c libavcodec/mpeg12.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/ppc/dsputil_altivec.c libavcodec/proresdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Drop DCTELEM typedefDiego Biurrun2013-01-221-2/+2
| | | | | | | | | | | | It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge commit 'df9b9567518f2840d79a4a96b447ebe1aa326408'Michael Niedermayer2012-12-051-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'df9b9567518f2840d79a4a96b447ebe1aa326408': lavc: fix decode_frame() third parameter semantics for video decoders Conflicts: libavcodec/cscd.c libavcodec/eamad.c libavcodec/ffv1dec.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/iff.c libavcodec/mjpegdec.c libavcodec/pcx.c libavcodec/vp56.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: fix decode_frame() third parameter semantics for video decodersAnton Khirnov2012-12-041-1/+1
| | | | | | | | It's got_frame, not data size
* | cosmetics: minor libavcodec spelling errorsLou Logan2012-06-291-1/+1
| | | | | | | | | | | | Also update some common misspelled words in patcheck Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support decoding of some unusual jpeg samples.Carl Eugen Hoyos2012-01-061-2/+3
| | | | | | | | | | | | Avoid unsupported pix_fmts by upscaling chroma. Fixes ticket #878.
* | Support decoding yuv442 and yuv421 jpeg images.Carl Eugen Hoyos2011-12-271-0/+2
| | | | | | | | Fixes ticket #787.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-011-0/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) libx264: set default thread count to 0 (auto) lavc: cosmetics, group deprecated codec flags mpeg12: add 'scan_offset' private option. h263/p encoder: add 'structured_slices' private option. h263/p encoder: add 'obmc' private option. h263p encoder: add 'aiv' private option. h263p encoder: add 'umv' private option. mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option. mjpegdec: add 'extern_huff' private option. mpeg4enc: add 'data_partitioning' private option. snow: add 'memc_only' private option. libx264: add 'mbtree' private option. libx264: add 'psy' private option. libmp3lame: add 'reservoir' private option. mpeg2enc: add 'non_linear_quant' private option mpeg12enc: add drop_frame_timecode private option. mpeg12enc: add intra_vlc private option. VC1: Support dynamic dimension changes mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested lavc: deprecate CODEC_FLAG2_BRDO ... Conflicts: avconv.c libavcodec/libmp3lame.c libavcodec/libx264.c libavcodec/mjpegdec.c libavcodec/mpeg12enc.c libavcodec/mpegvideo.h libavcodec/vc1.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegdec: add 'extern_huff' private option.Anton Khirnov2011-08-311-0/+5
| | | | | | | | Deprecate CODEC_FLAG_EXTERN_HUFF
| * Add support for picture_ptr field in MJpegDecodeContextanatoly2011-03-301-0/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Move MJPEG's input buffer preprocessing in separate public functionanatoly2011-03-301-0/+3
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Support reference picture defined by bitmask in MJPEG's SOS decoderanatoly2011-03-301-1/+2
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Add support for picture_ptr field in MJpegDecodeContextanatoly2011-04-261-0/+1
| | | | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Move MJPEG's input buffer preprocessing in separate public functionanatoly2011-04-261-0/+3
| | | | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support reference picture defined by bitmask in MJPEG's SOS decoderanatoly2011-04-261-1/+2
|/ | | | | | | With cleanup & simplification by me Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Add a seperate VLC table for progressive jpeg so we dont have to subtract 16 ↵Michael Niedermayer2010-10-211-1/+1
| | | | | | in the inner loop. Originally committed as revision 25545 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove DECLARE_ALIGNED_{8,16} macrosMåns Rullgård2010-03-061-1/+1
| | | | | | | These macros are redundant. All uses are replaced with the generic DECLARE_ALIGNED macro instead. Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move array specifiers outside DECLARE_ALIGNED() invocationsMåns Rullgård2010-01-221-1/+1
| | | | Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Avoid huge array for rgb ljpeg on the stack.Michael Niedermayer2009-11-021-0/+3
| | | | | | Code tested with an ljpeg i had laying around. Originally committed as revision 20433 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Flip (M)JPEG frames encoded by Intel JPEG library.Carl Eugen Hoyos2009-10-191-0/+1
| | | | | | Fixes issues 1464 and 1468. Originally committed as revision 20312 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a got_picture flag to MJpegDecodeContext which indicates if its pictureReimar Döffinger2009-07-041-0/+1
| | | | | | | | | element is valid. Skip the code handling SOS and EOI if not, since it can not work without a valid AVPicture. This fixes a crash with mjpeg/smclockmjpeg.avi.1.0 from issue 1240 where the decoder returned an invalid AVPicture. Originally committed as revision 19342 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename bitstream.h to get_bits.h.Stefano Sabatini2009-04-131-1/+1
| | | | Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes anThilo Borgmann2009-04-071-1/+1
| | | | | | | | | | | AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows passing of packet-specific flags from demuxer to decoder, such as the keyframe flag, which appears necessary to playback corePNG P-frames. Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread "Google Summer of Code participation" on the mailinglist. Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-011-1/+1
| | | | | | | Otherwise doxygen complains about ambiguous filenames when files exist under the same name in different subdirectories. Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-191-1/+1
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix progressive jpeg:Loren Merritt2008-12-101-0/+4
| | | | | | | | support refinement passes remove intermediate clipping remove redundant idct Originally committed as revision 16044 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-311-3/+3
| | | | | | | | | Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Increase alignment for DCT block arrays from 8 to 16Alexander Strange2008-04-081-1/+1
| | | | | | Patch by Alexander Strange ( astrange ithinksw com ) Originally committed as revision 12767 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud