summaryrefslogtreecommitdiffstats
path: root/libavcodec/tiff.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * tiffdec: use bytestream2 to simplify overread/overwrite protectionJustin Ruggles2014-04-121-138/+111
| | | | | | | | | | | | Based on a patch by Paul B Mahol <onemda@gmail.com> CC:libav-stable@libav.org
| * tiffdec: use correct data type for palette entries and set alpha to 0xFFJustin Ruggles2014-04-121-5/+6
| |
* | Merge commit 'bf2064f046af64c59a416c814474a39b0a457569'Michael Niedermayer2014-04-131-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'bf2064f046af64c59a416c814474a39b0a457569': tiffdec: rename variables for consistency and fix variable shadowing Conflicts: libavcodec/tiff.c See: 251345a3fe221d60e9b275567085f9475de68092 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiffdec: rename variables for consistency and fix variable shadowingJean First2014-04-121-8/+5
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | Read aspect ratio from tiff image files.Carl Eugen Hoyos2014-04-071-1/+20
| |
* | Issue-#3407 : Enhance precision for double to string conversion, useful for ↵Sylvain Fabre2014-02-231-2/+2
| | | | | | | | | | | | GEOTIFF double values Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: reset geotag_count in free_geotags()Michael Niedermayer2014-02-021-0/+1
| | | | | | | | | | | | | | Fixes null pointer dereference Fixes: signal_sigsegv_19d922e_3688_cov_1577641655_aletrek_tiff.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c265b8bb7638546919465e3585441b1d40c4b13d'Michael Niedermayer2013-11-011-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c265b8bb7638546919465e3585441b1d40c4b13d': tiff: stop using deprecated avcodec_set_dimensions targa: stop using deprecated avcodec_set_dimensions svq1dec: stop using deprecated avcodec_set_dimensions sunrast: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/sunrast.c libavcodec/targa.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-311-2/+2
| |
* | avcodec/tiff: factorize offset init codeMichael Niedermayer2013-10-271-3/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: remove TIFF_LONG special caseMichael Niedermayer2013-10-271-4/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: Fix use of uninitialized off variableMichael Niedermayer2013-10-271-3/+1
| | | | | | | | | | | | Fixes CID1108608 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: remove byte based bpp special caseMichael Niedermayer2013-10-201-3/+0
| | | | | | | | | | | | | | | | | | This case does not work as off is uninitialized and it should be handled fine by the generic code below Fixes CID1108608 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tiff: frame multithreading supportPaul B Mahol2013-08-131-6/+9
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/tiff: Refactor TIFF tag related functions to share the code.Thilo Borgmann2013-08-131-181/+27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tiff: continue parsing on non fatal errorsMichael Niedermayer2013-08-111-4/+5
| | | | | | | | | | Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: remove redundant checkMichael Niedermayer2013-08-091-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: avoid seek back on reading tagsMichael Niedermayer2013-08-091-7/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9c2216976907336dfae0e8e38a4d70ca2465a92c'Michael Niedermayer2013-06-081-5/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '9c2216976907336dfae0e8e38a4d70ca2465a92c': tiff: do not overread the source buffer Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: do not overread the source bufferLuca Barbato2013-06-071-1/+4
| | | | | | | | | | | | | | At least 2 bytes from the source are read every loop. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '999ccd2d0a43640921088578f138c874f6cc0f8a'Michael Niedermayer2013-06-081-9/+14
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '999ccd2d0a43640921088578f138c874f6cc0f8a': tiff: cleanup the error paths Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: cleanup the error pathsLuca Barbato2013-06-071-10/+15
| | | | | | | | Return the proper error values and optionally report them.
* | Merge commit '016c5b066de08a93a5f6b5beb0ef377356b35cde'Michael Niedermayer2013-06-081-37/+39
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '016c5b066de08a93a5f6b5beb0ef377356b35cde': tiff: refactor fax support in a separate function Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: refactor fax support in a separate functionLuca Barbato2013-06-071-32/+33
| |
* | Merge commit '103937681d7e6afd3e8caf8937272575e450fb55'Michael Niedermayer2013-06-081-59/+71
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '103937681d7e6afd3e8caf8937272575e450fb55': tiff: refactor deflate support in a separate function Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: refactor deflate support in a separate functionLuca Barbato2013-06-071-25/+37
| | | | | | | | Report when zlib support is missing.
* | tiff: simplify picking right pixel formatPaul B Mahol2013-06-061-8/+18
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | tiff: correctly decode saparate planes with horizontal differencing predictorPaul B Mahol2013-06-061-2/+8
| | | | | | | | | | | | Closes #2648. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | tiff: fix memleakMichael Niedermayer2013-06-031-1/+3
| | | | | | | | | | Fixes CID1026764 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee'Michael Niedermayer2013-06-031-45/+49
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee': tiff: K&R formatting cosmetics Conflicts: libavcodec/tiff.c libavcodec/tiff.h libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: K&R formatting cosmeticsDiego Biurrun2013-06-021-55/+59
| |
* | Fix compilation of libavcodec/tiff.cCarl Eugen Hoyos2013-06-021-2/+2
| |
* | tiff: planar rgbPaul B Mahol2013-06-021-16/+30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | tiff: support inverted fill_order for packbits compressionPaul B Mahol2013-05-291-1/+6
| | | | | | | | | | | | Fixes #1995. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | tiff: add helper function for fill_order casePaul B Mahol2013-05-291-22/+21
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | tiff: fix handling of metadata with refcounted framesHendrik Leppkes2013-03-131-18/+14
| | | | | | | | | | | | | | | | | | | | | | Since the conversion to refcounted frames, the tiff decoder only wrote the metadata into its internal "picture" in its own context, never exposing the metadata to the user, and eventually leaking the metadata. Instead, properly store the metadata directly into the frame being decoded into. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: factorize ff_{thread_,re,}get_buffer error messages.Clément Bœsch2013-03-131-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coccinelle profile used: @@ expression r, ctx, f, loglevel, str, flags; @@ -if ((r = ff_get_buffer(ctx, f, flags)) < 0) { - av_log(ctx, loglevel, str); - return r; -} +if ((r = ff_get_buffer(ctx, f, flags)) < 0) + return r; @@ expression r, ctx, f, loglevel, str; @@ -if ((r = ff_reget_buffer(ctx, f)) < 0) { - av_log(ctx, loglevel, str); - return r; -} +if ((r = ff_reget_buffer(ctx, f)) < 0) + return r; @@ expression r, ctx, f, loglevel, str, flags; @@ -if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) { - av_log(ctx, loglevel, str); - return r; -} +if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) + return r; ...along with some manual patches for the remaining ones.
* | Merge commit '759001c534287a96dc96d1e274665feb7059145d'Michael Niedermayer2013-03-121-19/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '759001c534287a96dc96d1e274665feb7059145d': lavc decoders: work with refcounted frames. Anton Khirnov (1): lavc decoders: work with refcounted frames. Clément Bœsch (47): lavc/ansi: reset file lavc/ansi: re-do refcounted frame changes from Anton fraps: reset file lavc/fraps: switch to refcounted frames gifdec: reset file lavc/gifdec: switch to refcounted frames dsicinav: resolve conflicts smc: resolve conflicts zmbv: resolve conflicts rpza: resolve conflicts vble: resolve conflicts xxan: resolve conflicts targa: resolve conflicts vmnc: resolve conflicts utvideodec: resolve conflicts tscc: resolve conflicts ulti: resolve conflicts ffv1dec: resolve conflicts dnxhddec: resolve conflicts v210dec: resolve conflicts vp3: resolve conflicts vcr1: resolve conflicts v210x: resolve conflicts wavpack: resolve conflicts pngdec: fix compilation roqvideodec: resolve conflicts pictordec: resolve conflicts mdec: resolve conflicts tiertexseqv: resolve conflicts smacker: resolve conflicts vb: resolve conflicts vqavideo: resolve conflicts xl: resolve conflicts tmv: resolve conflicts vmdav: resolve conflicts truemotion1: resolve conflicts truemotion2: resolve conflicts lcldec: fix compilation libcelt_dec: fix compilation qdrw: fix compilation r210dec: fix compilation rl2: fix compilation wnv1: fix compilation yop: fix compilation tiff: resolve conflicts interplayvideo: fix compilation qpeg: resolve conflicts (FIXME/TESTME). Hendrik Leppkes (33): 012v: convert to refcounted frames 8bps: fix compilation 8svx: resolve conflicts 4xm: resolve conflicts aasc: resolve conflicts bfi: fix compilation aura: fix compilation alsdec: resolve conflicts avrndec: convert to refcounted frames avuidec: convert to refcounted frames bintext: convert to refcounted frames cavsdec: resolve conflicts brender_pix: convert to refcounted frames cinepak: resolve conflicts cinepak: avoid using AVFrame struct directly in private context cljr: fix compilation cpia: convert to refcounted frames cscd: resolve conflicts iff: resolve conflicts and do proper conversion to refcounted frames 4xm: fix reference frame handling cyuv: fix compilation dxa: fix compilation eacmv: fix compilation eamad: fix compilation eatgv: fix compilation escape124: remove unused variable. escape130: convert to refcounted frames evrcdec: convert to refcounted frames exr: convert to refcounted frames mvcdec: convert to refcounted frames paf: properly free the frame data on decode close sgirle: convert to refcounted frames lavfi/moviesrc: use refcounted frames Michael Niedermayer (56): Merge commit '759001c534287a96dc96d1e274665feb7059145d' resolve conflicts in headers motion_est: resolve conflict mpeg4videodec: fix conflicts dpcm conflict fix dpx: fix conflicts indeo3: resolve confilcts kmvc: resolve conflicts kmvc: resolve conflicts h264: resolve conflicts utils: resolve conflicts rawdec: resolve conflcits mpegvideo: resolve conflicts svq1enc: resolve conflicts mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads pthreads: resolve conflicts frame_thread_encoder: simple compilefix not yet tested snow: update to buffer refs crytsalhd: fix compile dirac: switch to new API sonic: update to new API svq1: resolve conflict, update to new API ffwavesynth: update to new buffer API g729: update to new API indeo5: fix compile j2kdec: update to new buffer API linopencore-amr: fix compile libvorbisdec: update to new API loco: fix compile paf: update to new API proresdec: update to new API vp56: update to new api / resolve conflicts xface: convert to refcounted frames xan: fix compile&fate v408: update to ref counted buffers v308: update to ref counted buffers yuv4dec: update to ref counted buffers y41p: update to ref counted frames xbm: update to refcounted frames targa_y216: update to refcounted buffers qpeg: fix fate/crash cdxl: fix fate tscc: fix reget buffer useage targa_y216dec: fix style msmpeg4: fix fate h264: ref_picture() copy fields that have been lost too update_frame_pool: use channel field h264: Put code that prevents deadlocks back mpegvideo: dont allow last == current wmalossless: fix buffer ref messup ff_alloc_picture: free tables in case of dimension mismatches h264: fix null pointer dereference and assertion failure frame_thread_encoder: update to bufrefs ec: fix used arrays snowdec: fix off by 1 error in dimensions check h264: disallow single unpaired fields as references of frames Paul B Mahol (2): lavc/vima: convert to refcounted frames sanm: convert to refcounted frames Conflicts: libavcodec/4xm.c libavcodec/8bps.c libavcodec/8svx.c libavcodec/aasc.c libavcodec/alsdec.c libavcodec/anm.c libavcodec/ansi.c libavcodec/avs.c libavcodec/bethsoftvideo.c libavcodec/bfi.c libavcodec/c93.c libavcodec/cavsdec.c libavcodec/cdgraphics.c libavcodec/cinepak.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/dsicinav.c libavcodec/dvdec.c libavcodec/dxa.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/eatgq.c libavcodec/eatgv.c libavcodec/eatqi.c libavcodec/error_resilience.c libavcodec/escape124.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/flicvideo.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_direct.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/huffyuvdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo2.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/ivi_common.c libavcodec/jvdec.c libavcodec/kgv1dec.c libavcodec/kmvc.c libavcodec/lagarith.c libavcodec/libopenjpegdec.c libavcodec/mdec.c libavcodec/mimic.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mmvideo.c libavcodec/motion_est.c libavcodec/motionpixels.c libavcodec/mpc7.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/msrle.c libavcodec/msvideo1.c libavcodec/nuv.c libavcodec/options_table.h libavcodec/pcx.c libavcodec/pictordec.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/pthread.c libavcodec/qpeg.c libavcodec/qtrle.c libavcodec/r210dec.c libavcodec/rawdec.c libavcodec/roqvideodec.c libavcodec/rpza.c libavcodec/smacker.c libavcodec/smc.c libavcodec/svq1dec.c libavcodec/svq1enc.c libavcodec/targa.c libavcodec/tiertexseqv.c libavcodec/tiff.c libavcodec/tmv.c libavcodec/truemotion1.c libavcodec/truemotion2.c libavcodec/tscc.c libavcodec/ulti.c libavcodec/utils.c libavcodec/utvideodec.c libavcodec/v210dec.c libavcodec/v210x.c libavcodec/vb.c libavcodec/vble.c libavcodec/vcr1.c libavcodec/vmdav.c libavcodec/vmnc.c libavcodec/vp3.c libavcodec/vp56.c libavcodec/vp56.h libavcodec/vp6.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/xl.c libavcodec/xxan.c libavcodec/zmbv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc decoders: work with refcounted frames.Anton Khirnov2013-03-081-18/+9
| |
* | Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'Michael Niedermayer2013-03-081-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e': Move AVFrame from lavc to lavu. Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | tiff: use AVFrame accessor functionsMichael Niedermayer2013-03-011-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tiff: check bppcountMichael Niedermayer2013-02-191-0/+5
| | | | | | | | | | | | | | Fixes division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tiff: Check buffer allocation and pointer increment more carefully in ↵Michael Niedermayer2013-02-121-5/+15
| | | | | | | | | | | | | | | | | | shorts2str() and double2str() Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tiff: dont leave geotag_count in an invalid state on errors.Michael Niedermayer2013-02-101-1/+4
| | | | | | | | | | | | | | Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tiff: check for failure in search_keyval()Michael Niedermayer2013-02-101-3/+9
| | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tiff: in add_string_metadata() check the count more completelyMichael Niedermayer2013-01-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tiff: Fix assignments in if()Michael Niedermayer2013-01-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9dbbda235d93d628777b986e502213f1ed390973'Michael Niedermayer2013-01-071-27/+27
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9dbbda235d93d628777b986e502213f1ed390973': vb: return meaningful error codes. ptx: return meaningful error codes. tiff: return meaningful error codes. vqavideo: return meaningful error codes. mss2: return meaningful error codes. v210dec: return meaningful error codes indeo2: cosmetics, reformat Conflicts: libavcodec/indeo2.c libavcodec/tiff.c libavcodec/v210dec.c libavcodec/vb.c libavcodec/vqavideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: return meaningful error codes.Anton Khirnov2013-01-061-27/+27
| |
* | tiffdec: Use the correct height field.Piotr Bandurski2013-01-061-1/+1
| | | | | | | | | | | | Fixes Ticket913 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud