summaryrefslogtreecommitdiff
path: root/libavcodec/faxcompr.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-081-19/+19
|\ | | | | | | | | | | | | | | | | | | * qatar/master: faxcompr: return meaningful errors Conflicts: libavcodec/faxcompr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * faxcompr: return meaningful errorsLuca Barbato2013-06-071-19/+19
| | | | | | | | | | | | And optionally forward them to the caller instead of concealing them. Unify err and ret in a single variable.
* | Merge commit 'f32aefcf349f2f1367f0143782397643416d18f3'Michael Niedermayer2013-06-081-72/+79
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'f32aefcf349f2f1367f0143782397643416d18f3': faxcompr: K&R formatting cosmetics Conflicts: libavcodec/faxcompr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * faxcompr: K&R formatting cosmeticsLuca Barbato2013-06-071-69/+75
| |
* | faxcompr: Dont read ref when the end has been reached in pass modeMichael Niedermayer2013-02-121-2/+4
| | | | | | | | | | | | | | Fixes reading over the end Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tiffdec: Fix runend handlingMichael Niedermayer2012-12-241-3/+7
| | | | | | | | | | | | Fixes Ticket1999 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | faxcompr: fix out of array readMichael Niedermayer2012-09-071-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | faxcompr: fix byte alignment caseMichael Niedermayer2012-08-301-1/+2
| | | | | | | | | | | | | | Fixes Ticket1653 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ccitt fax: fix some group3 1d files without EOLMichael Niedermayer2012-08-171-1/+3
| | | | | | | | | | | | Fixes Ticket832 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-131-5/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: K&R formatting cosmetics (part II) tiffdec: Add a malloc check and refactor another. faxcompr: Check malloc results and unify return path configure: escape colons in values written to config.fate ac3dsp: call femms/emms at the end of float_to_fixed24() for 3DNow and SSE matroska: Fix leaking memory allocated for laces. pthread: Fix crash due to fctx->delaying not being cleared. vp3: Assert on invalid filter_limit values. h264: fix 10bit biweight functions after recent x86inc.asm fixes. ffv1: Fix size mismatch in encode_line. movenc: Remove a dead initialization git-howto: Explain how to avoid Windows line endings in git checkouts. build: Move all arch OBJS declarations into arch subdirectory Makefiles. Conflicts: configure libavcodec/vp3.c libavformat/matroskadec.c libavutil/Makefile libswscale/Makefile libswscale/swscale.c libswscale/swscale_internal.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * faxcompr: Check malloc results and unify return pathAlex Converse2012-04-131-5/+10
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-161-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) ppc: Add ff_ prefix to nonstatic symbols sh4: Add ff_ prefix to nonstatic symbols mpegvideo: Add ff_ prefix to nonstatic functions rtjpeg: Add ff_ prefix to nonstatic symbols rv: Add ff_ prefix to nonstatic symbols vp56: Add ff_ prefix to nonstatic symbols vorbis: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefix to nonstatic symbols vc1: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefixes to nonstatic symbols snow: Add ff_ prefix to nonstatic symbols mpeg12: Add ff_ prefix to nonstatic symbols mpeg4: Add ff_ prefixes to nonstatic symbols lagarith: Add ff_ prefix to lag_rac_init libavcodec: Add ff_ prefix to j_rev_dct* dsputil: Add ff_ prefix to inv_zigzag_direct16 libavcodec: Prefix fdct_ifast, fdct_ifast248 dsputil: Add ff_ prefix to the dsputil*_init* functions libavcodec: Add ff_ prefix to some nonstatic symbols vlc/rl: Add ff_ prefix to the nonstatic symbols ... Conflicts: libavcodec/Makefile libavcodec/allcodecs.c libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h263.h libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/nuv.c libavcodec/ppc/dsputil_ppc.c libavcodec/proresdsp.c libavcodec/svq3.c libavcodec/version.h libavformat/dv.h libavformat/dvenc.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vlc/rl: Add ff_ prefix to the nonstatic symbolsMartin Storsjö2012-02-151-5/+5
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-151-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: Automatically add more flags required on symbian mem.h: switch doxygen parameter order to match function prototype doxygen: replace @sa tag by the more readable but equivalent @see doxygen: use Doxygen markup for authors and web links where appropriate doxygen: do not include license boilerplate in Doxygen documentation ac3enc: Mark AVClasses const ffserver: Replace two loops with one loop. ffmpeg: Fix the check for experimental codecs swscale: extend mmx padding. swscale: clip unscaled colorspace conversion path. doxygen: misc consistency cosmetics doc: remove file name from @file directive in Doxygen usage example doxygen: consistently place brief description doxygen: place empty line between brief description and detailed description avformat_open_input(): Add braces to shut up gcc warning. Conflicts: libavcodec/8svx.c libavcodec/tiff.c libavcodec/tiff.h libavcodec/vaapi_h264.c libavcodec/vorbis.c libavcodec/vorbisdec.c libavcodec/vp6.c libswscale/swscale_unscaled.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: consistently place brief descriptionDiego Biurrun2011-07-141-1/+1
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* 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
* Simplify r20025: use align_get_bits instead of reimplementing it.Reimar Döffinger2009-09-291-2/+2
| | | | Originally committed as revision 20079 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make sure all the bits are written to output in fax data decoder.Kostya Shishkov2009-09-291-0/+1
| | | | | | | This fixes decoding TIFF images with fax compression and width being not multiple of eight (and issue 1429). Originally committed as revision 20072 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: reindent and reformat function declarationsKostya Shishkov2009-09-281-2/+3
| | | | Originally committed as revision 20066 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Finally distinguish TIFF_CCITT_RLE and TIFF_G3 1-D case, so both of themKostya Shishkov2009-09-281-2/+3
| | | | | | | will be decoded correctly. This fixes issue 1423. Originally committed as revision 20065 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix decoding of TIFF CCITT RLE compressed data.Kostya Shishkov2009-09-261-1/+3
| | | | | | This fixes issue 1417. Originally committed as revision 20025 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
* Split bitstream.h, put the bitstream writer stuff in the new fileStefano Sabatini2009-04-121-0/+1
| | | | | | put_bits.h. Originally committed as revision 18461 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
* Add missing void keyword to parameterless function declarations.Diego Biurrun2009-01-301-1/+1
| | | | Originally committed as revision 16860 to svn://svn.ffmpeg.org/ffmpeg/trunk
* indentMichael Niedermayer2008-12-261-1/+1
| | | | Originally committed as revision 16348 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify vertical modeMichael Niedermayer2008-12-261-3/+0
| | | | Originally committed as revision 16347 to svn://svn.ffmpeg.org/ffmpeg/trunk
* And another sechole ...Michael Niedermayer2008-12-261-1/+1
| | | | Originally committed as revision 16346 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix yet another sechole.Michael Niedermayer2008-12-261-3/+4
| | | | Originally committed as revision 16345 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix another sechole.Michael Niedermayer2008-12-261-6/+6
| | | | Originally committed as revision 16344 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Minor simplification.Michael Niedermayer2008-12-261-1/+1
| | | | Originally committed as revision 16343 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unused run_start variable.Michael Niedermayer2008-12-261-1/+0
| | | | Originally committed as revision 16342 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move sync line pointers code to the end of the loop, it is simpler that way.Michael Niedermayer2008-12-261-5/+5
| | | | Originally committed as revision 16341 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Get rid of check for condition that is always true (run_off < avctx->width).Michael Niedermayer2008-12-261-1/+1
| | | | Originally committed as revision 16340 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Get rid of pix_left in the 2d code, it is simpler that way.Michael Niedermayer2008-12-261-11/+8
| | | | Originally committed as revision 16339 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorize "avctx->width + 2" out to avoid someone mistakenly changingMichael Niedermayer2008-12-261-3/+4
| | | | | | some but not all. Originally committed as revision 16336 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetic (moving pix_left update)Michael Niedermayer2008-12-261-1/+1
| | | | Originally committed as revision 16335 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Close gaping sechole. That is, a series of run=0 allows arbitrary data toMichael Niedermayer2008-12-261-6/+21
| | | | | | be written over the end of the runs array. Originally committed as revision 16334 to svn://svn.ffmpeg.org/ffmpeg/trunk
* minor simplificationMichael Niedermayer2008-12-261-2/+2
| | | | Originally committed as revision 16333 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Merge ff_ccitt_unpack_1d and 2d.Michael Niedermayer2008-12-261-31/+4
| | | | Originally committed as revision 16332 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Ensure that an invalid run terminates the line.Michael Niedermayer2008-12-261-1/+1
| | | | Originally committed as revision 16331 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l != vs. == (yes, my fault not kostya's).Michael Niedermayer2008-12-261-1/+1
| | | | Originally committed as revision 16330 to svn://svn.ffmpeg.org/ffmpeg/trunk
* indentMichael Niedermayer2008-12-261-1/+1
| | | | Originally committed as revision 16329 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify zero run handling in put_line().Michael Niedermayer2008-12-261-3/+1
| | | | Originally committed as revision 16328 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Avoid negation in put_line().Michael Niedermayer2008-12-261-4/+4
| | | | Originally committed as revision 16327 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorize mode switching in put_line().Michael Niedermayer2008-12-261-3/+2
| | | | Originally committed as revision 16326 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix (rewrite) find_group3_syncmarker().Michael Niedermayer2008-12-261-7/+7
| | | | Originally committed as revision 16325 to svn://svn.ffmpeg.org/ffmpeg/trunk
* CCITT Fax Group 3 and 4 decompression by kostya.Michael Niedermayer2008-12-261-0/+333
Will be activated after a little more reviewing and fixing by me. Commited now, so as to not lose history of that. Originally committed as revision 16323 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status