summaryrefslogtreecommitdiff
path: root/libavcodec/mjpegdec.c
Commit message (Collapse)AuthorAge
...
* mjpeg: abort decoding if packet is too large.Ronald S. Bultje2012-02-24
| | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* dsputil: Add ff_ prefix to the dsputil*_init* functionsMartin Storsjö2012-02-15
| | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* vlc/rl: Add ff_ prefix to the nonstatic symbolsMartin Storsjö2012-02-15
| | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* mjpegdec: use av_fast_padded_malloc()Reimar Döffinger2012-02-01
| | | | | | also check for allocation failure Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* lavc: remove disabled FF_API_MJPEG_GLOBAL_OPTS cruft.Anton Khirnov2012-01-27
|
* mjpegdec: K&R formatting cosmeticsDaniel Huang2012-01-08
| | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scanJanne Grunau2012-01-05
| | | | | | | Check explicitly if enough bits are left to prevent an infinite loop when the bitstream buffer is not followed by zero-padding. Based on patches by Michael Niedermayer <michaelni@gmx.at>.
* mov: Don't stick the QuickTime field ordering atom in extradata.Alex Converse2011-12-21
| | | | | | The 'fiel' atoms can be found in H.264 tracks clobbering the extradata. MJPEG supports non field based extradata, and this data should be preserved when copying.
* Fix a bunch of common typos.Diego Biurrun2011-12-11
|
* lavc: replace references to deprecated AVCodecContext.error_recognition to ↵Dustin Brody2011-10-22
| | | | | | use AVCodecContext.err_recognition Signed-off-by: Anton Khirnov <anton@khirnov.net>
* AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*Anton Khirnov2011-10-12
|
* mjpegdec: add 'extern_huff' private option.Anton Khirnov2011-08-31
| | | | Deprecate CODEC_FLAG_EXTERN_HUFF
* mjpeg: treat external huffman table setup failure as codec init failure if ↵Dustin Brody2011-08-31
| | | | | | external huffman table use requested Signed-off-by: Anton Khirnov <anton@khirnov.net>
* mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqtDustin Brody2011-08-11
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* lavc: use designated initialisers for all codecs.Anton Khirnov2011-07-29
| | | | It's more readable and less prone to breakage.
* jpegdec: actually search for and parse RSTnMichael Niedermayer2011-07-23
| | | | | | | | | | | | | Fixes decoding of MJPEG files produced by some UVC Logitec web cameras, such as "Notebook Pro" and "HD C910". References: http://trac.videolan.org/vlc/ticket/4215 http://ffmpeg.org/trac/ffmpeg/ticket/267 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Reviewed-by: Kostya <kostya.shishkov@gmail.com> (cherry picked from commit 7b8ed831eb8432d202dad16dedc1758b018bb1fa)
* Remove unused structs and tables.Diego Biurrun2011-07-16
|
* Remove statements immediately following unconditional jumpsMans Rullgard2011-07-03
| | | | | | This removes a number of compiler warnings. Signed-off-by: Mans Rullgard <mans@mansr.com>
* mjpeg: remove pointless braces around block of codeMans Rullgard2011-07-03
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini2011-05-02
| | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* mjpeg: Detect overreads in mjpeg_decode_scan() and error out.Michael Niedermayer2011-04-26
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Ronald S. Bultje <rbultje@google.com>
* Add support for picture_ptr field in MJpegDecodeContextanatoly2011-03-30
| | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* Move MJPEG's input buffer preprocessing in separate public functionanatoly2011-03-30
| | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* Support reference picture defined by bitmask in MJPEG's SOS decoderanatoly2011-03-30
| | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Set maximum lowres value for the MJPEG decoder to 3.Carl Eugen Hoyos2011-02-16
| | | | | | | While 4 works for some samples, 3 is the correct value since 8x8 DCT is used by (m)jpeg. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* Merge libavcore into libavutilReinhard Tartler2011-02-15
| | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* Replace dprintf with av_dlogLuca Barbato2011-01-29
| | | | dprintf clashes with POSIX.1-2008
* Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-26
| | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Sanitise get_bits macros, part 1Mans Rullgard2011-01-23
| | | | | | | | | Some of the macros in get_bits.h include a final semicolon, some do not. This removes these or adds do {} while(0) around the macros as appropriate and adds semicolons where needed in calling code. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Values >4 for lowres corrupt output.Carl Eugen Hoyos2011-01-16
| | | | Originally committed as revision 26386 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix memleak in mjpeg decoder.Michael Niedermayer2010-10-22
| | | | Originally committed as revision 25549 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Optimize EOB check in mjpeg decode_block() by adjusting the VLC symbol.Michael Niedermayer2010-10-21
| | | | Originally committed as revision 25548 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify last coeff check in mjpeg decode_block()Michael Niedermayer2010-10-21
| | | | Originally committed as revision 25547 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check index in mjpeg AC decode against overflowing.Michael Niedermayer2010-10-21
| | | | | | This fixes a possibly exploitable buffer overflow and it will likely also be needed for future overreading fixes. Originally committed as revision 25546 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a seperate VLC table for progressive jpeg so we dont have to subtract 16 ↵Michael Niedermayer2010-10-21
| | | | | | in the inner loop. Originally committed as revision 25545 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factor code&0xf out of if() in decode_block_progressive().Michael Niedermayer2010-10-21
| | | | Originally committed as revision 25544 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cleanup decode_block_progressive()Michael Niedermayer2010-10-21
| | | | Originally committed as revision 25543 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorize ((unsigned) code) >> 4 out of decode_block_progressive() in jpeg.Michael Niedermayer2010-10-21
| | | | Originally committed as revision 25542 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move if() in mjpeg decode_block() to simplify condition.Michael Niedermayer2010-10-21
| | | | Originally committed as revision 25541 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify build_vlc() by using init_vlc_sparse() in mjpeg.Michael Niedermayer2010-10-21
| | | | Originally committed as revision 25540 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use new imgutils.h API names, fix deprecation warnings.Stefano Sabatini2010-09-07
| | | | Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix undefined expressions that use multiple calls to get_bits().Alex Converse2010-08-24
| | | | | | | | | Because the order of evaluation of subexpressions is undefined, two get_bits() calls may not be part of the same expression. See also r24902. Originally committed as revision 24906 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove use of the deprecated function avcodec_check_dimensions(), useStefano Sabatini2010-08-06
| | | | | | av_check_image_size() instead. Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add av_ prefix to bswap macrosMåns Rullgård2010-07-10
| | | | Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
* bswap: change ME to NE in macro namesMåns Rullgård2010-07-10
| | | | | | | Other parts of FFmpeg use NE (native endian) rather than ME (machine). This makes it consistent. Originally committed as revision 24169 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add new decoder property max_lowres and do not init decoder if requested ↵Carl Eugen Hoyos2010-07-07
| | | | | | value is higher. Originally committed as revision 24098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-20
| | | | | | | | 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
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix misc typos, patch byStefano Sabatini2010-01-27
| | | | | | Fabian Greffrath base64_decode(PGZhYmlhbkBncmVmZnJhdGguY29tPg==). Originally committed as revision 21473 to svn://svn.ffmpeg.org/ffmpeg/trunk