summaryrefslogtreecommitdiff
path: root/libavcodec/msrledec.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/msrledec: Ask for sample that uses a branch with a unused byteMichael Niedermayer2015-05-141-0/+1
| | | | | | | | Finding out if this is correct or buggy is easiest with a sample Fixes: CID1297620 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* msrledec: use signed pixel_ptr in msrle_decode_pal4Andreas Cadhalpun2015-04-161-1/+1
| | | | | | | | | | | | | This fixes segmentation faults, when pic->linesize[0] is negative. In that case 'line * pic->linesize[0] + pixel_ptr' is treated as unsigned and wraps around. This reverts commit 7d78a964. The problem was introduced in commit f7e1367f, which should obsolete that commit. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/msrledec: More verbose error messageMichael Niedermayer2015-03-241-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/msrledec: restructure msrle_decode_pal4() based on the line number ↵Michael Niedermayer2015-03-241-14/+11
| | | | | | | | | | instead of the pixel pointer Fixes out of array access Fixes: da14e86d8462be6493eab16bc2d40f88/asan_heap-oob_204cfd2_528_cov_340150052_COMPRESS.BMP Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* msrledec: use memset()Paul B Mahol2013-08-261-2/+2
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* msrledec: use bytestream2_get_bufferu()Paul B Mahol2013-08-261-3/+3
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* msrledec: fix output_end checksMichael Niedermayer2013-03-051-5/+6
| | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177'Michael Niedermayer2013-02-061-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177': aasc: fix output for msrle compression. msrledec: check bounds before constructing a possibly invalid pointer, cmdutils: remove ansi from the list of broken codecs. Conflicts: tests/ref/fate/aasc Also See: e7117f1c1058d41eb759d1613e849c29b15c85b5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * msrledec: check bounds before constructing a possibly invalid pointer,Anton Khirnov2013-02-061-2/+2
| | | | | | | | CC:libav-stable@libav.org
* | msrledec: merge switchesMichael Niedermayer2013-01-301-12/+7
| | | | | | | | | | | | More speedup and fixes 'may be used uninitialized in this function' warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | msrledec: move loop into switchMichael Niedermayer2013-01-301-14/+23
| | | | | | | | | | | | speeds up code and allows more simplifications Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | msrledec: move output pointer test upMichael Niedermayer2013-01-301-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-131-67/+66
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libxvid: remove disabled code qdm2: make a table static const qdm2: simplify bitstream reader setup for some subpacket types qdm2: use get_bits_left() build: Consistently handle conditional compilation for all optimization OBJS. avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics msrle: convert MS RLE decoding function to bytestream2. x86inc improvements for 64-bit Conflicts: common.mak libavcodec/avpacket.c libavcodec/bfi.c libavcodec/msrledec.c libavcodec/qdm2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * msrle: convert MS RLE decoding function to bytestream2.Ronald Bultje2012-04-111-63/+66
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-141-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtpdec: Use 4 byte startcodes for H.264 matroskadec: Mark variable as av_unused. Move some conditionally used variables into the block where they are used. Drop some completely unnecessary av_unused attributes. swscale: Remove unused variable alpMmxFilter. Drop unnecessary av_uninit attributes from some variable declarations. movenc: Support muxing wmapro in ismv/isma mpegtsenc: Add an AVOption for forcing a new PAT/PMT/SDT to be written swscale: move YUV2PACKED16WRAPPER() macro down to where it is used. swscale: handle gray16 as a "planar" YUV format (Y-only, of course). swscale: use yuv2packed1() functions for unscaled chroma also. swscale: fix incorrect chroma bias in yuv2rgb48_1_c(). swscale: fix invalid memory accesses in yuvpacked1() functions. Move PS2 MMI code below the mips subdirectory, where it belongs. mips: Move MMI function declarations to a header. build: Set correct dependencies for rtmp* protocols implemented by librtmp. Conflicts: libavcodec/ac3enc_template.c libavformat/mpegtsenc.c libswscale/output.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Drop unnecessary av_uninit attributes from some variable declarations.Diego Biurrun2012-02-131-2/+2
| | | | | | | | Recent versions of gcc (4.4+) no longer give false positive warnings.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-291-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: aacenc: Fix LONG_START windowing. aacenc: Fix a bug where deinterleaved samples were stored in the wrong place. avplay: use the correct array size for stride. lavc: extend doxy for avcodec_alloc_context3(). APIchanges: mention avcodec_alloc_context()/2/3 avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS. aacsbr: ARM NEON optimised sbrdsp functions aacsbr: align some arrays aacsbr: move some simdable loops to function pointers cosmetics: Remove extra newlines at EOF Conflicts: libavcodec/utils.c libavfilter/formats.c libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Remove extra newlines at EOFAlex Converse2012-01-271-1/+0
| |
* | msrledec: Check for overreadsMichael Niedermayer2011-12-131-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-081-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: drawtext: remove typo pcm-mpeg: implement new audio decoding api w32thread: port fixes to pthread_cond_broadcast() from x264. doc: add editor configuration section with Vim and Emacs settings dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9 avformat/utils: Drop unused goto label. doxygen: Replace '\' by '@' in Doxygen markup tags. cosmetics: drop some completely pointless parentheses cljr: simplify CLJRContext drawtext: introduce rand(min, max) drawtext: introduce explicit draw/hide variable rtmp: Use nb_invokes for all invoke commands Conflicts: libavcodec/mpegvideo.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: drop some completely pointless parenthesesDiego Biurrun2011-12-071-2/+2
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Fix possibly exploitable out of buffer writes in msrle_decode_pal4().Michael Niedermayer2010-11-021-1/+1
| | | | | | This fix is minimalistic, that function should be cleaned up by someone. Originally committed as revision 25633 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix possibly exploitable buffer overrun in msrle_decode_8_16_24_32().Michael Niedermayer2010-11-021-2/+3
| | | | | | Issue has been reported to me by Gynvael Coldwind Originally committed as revision 25632 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove impossible condition from msrle_decode_pal4()Michael Niedermayer2010-11-021-4/+2
| | | | Originally committed as revision 25631 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix indentMichael Niedermayer2010-11-021-26/+26
| | | | Originally committed as revision 25630 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
* Include msrledec.h: It contains the prototype for ff_msrle_decode().Carl Eugen Hoyos2010-02-281-0/+1
| | | | Originally committed as revision 22105 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make MS RLE decoder produce both bottom-up and top-down picturesKostya Shishkov2009-10-011-2/+4
| | | | Originally committed as revision 20111 to svn://svn.ffmpeg.org/ffmpeg/trunk
* do not print false error if eof follows eolBaptiste Coudurier2009-05-271-1/+1
| | | | Originally committed as revision 18965 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Fix some typos.Diego Biurrun2009-05-221-4/+4
| | | | Originally committed as revision 18894 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix off-by-one error in MS RLE decoder which may result into writing pastKostya Shishkov2009-05-161-1/+1
| | | | | | picture buffer. Originally committed as revision 18852 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add av_uninit macro to variables to avoid false positive warnings:Diego Biurrun2009-02-111-2/+2
| | | | | | | | libavcodec/msrledec.c: In function ‘ff_msrle_decode’: libavcodec/msrledec.c:139: warning: ‘pix32’ may be used uninitialized in this function libavcodec/msrledec.c:138: warning: ‘pix16’ may be used uninitialized in this function Originally committed as revision 17156 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
* Fix build: Add intreadwrite.h and bswap.h #includes where necessary.Diego Biurrun2009-01-111-0/+1
| | | | Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make decoding run of pixels in MS RLE saner.Kostya Shishkov2008-12-061-3/+1
| | | | | | | This is based on patches by Alex Converse and Mans Rullgard Thread "[PATCH] Fix MSRLE type punning" Originally committed as revision 16013 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Print out some errors found during MS RLE decodingKostya Shishkov2008-12-061-2/+6
| | | | Originally committed as revision 16012 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorize out code used for MS RLE format decoding in different decoders.Kostya Shishkov2008-09-181-0/+254
Originally committed as revision 15356 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status