summaryrefslogtreecommitdiff
path: root/libavcodec/tiffenc.c
Commit message (Collapse)AuthorAge
* tiff: Return more meaningful error codesHimangi Saraogi2015-03-30
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavc/tiffenc: Support encoding ya16le.Carl Eugen Hoyos2015-01-22
|
* avcodec/tiffenc: remove double ;;Clément Bœsch2015-01-18
|
* Merge commit '3a3790b8f8b56ee6abc93ccac280eb693675e294'Michael Niedermayer2014-12-19
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a3790b8f8b56ee6abc93ccac280eb693675e294': tiff: support encoding and decoding 64bit images Conflicts: libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/version.h See: c714cd3bd4af70e0cba1db399ca420b1f51a773d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: support encoding and decoding 64bit imagesCarl Eugen Hoyos2014-12-18
| |
* | avcodec/tiffenc: Consistently use ADD_ENTRY1()Michael Niedermayer2014-12-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '10d4c5e55e5b23e165aa4c7723073ebe2c2e7da0'Michael Niedermayer2014-12-15
|\| | | | | | | | | | | | | * commit '10d4c5e55e5b23e165aa4c7723073ebe2c2e7da0': tiff: set the correct return value when check_size() fails Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: set the correct return value when check_size() failsVittorio Giovara2014-12-15
| | | | | | | | Only one instance affected and solved as other occurences.
* | Merge commit '3c27275c1309190f2d6ed69140b67d014215b6c9'Michael Niedermayer2014-12-15
|\| | | | | | | | | | | | | | | | | | | | | * commit '3c27275c1309190f2d6ed69140b67d014215b6c9': tiff: Check the check_size() return value and forward it Conflicts: libavcodec/tiffenc.c See: d50aa006fb3430bedc3872ba10e028a714499625 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: Check the check_size() return value and forward itLuca Barbato2014-12-15
| | | | | | | | | | | | | | | | | | | | Also use the same type for add_entry and check_size. Bug-Id: CID 700699 CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Vittorio Giovara <vittorio.giovarao@gmail.com>
* | Merge commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1'Michael Niedermayer2014-11-24
|\| | | | | | | | | | | | | | | | | | | * commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1': tiffenc: initialize return value Conflicts: libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiffenc: initialize return valueVittorio Giovara2014-11-24
| | | | | | | | | | | | | | | | | | 'ret' can only be used without initialization if s->height <= 0, which can only happen if avctx->height <= 0, which is validated elsewhere. Doesn't hurt to still initialize it though. CC: libav-stable@libav.org Bug-Id: CID 732296
* | libavcodec/tiffenc: Use av_freep() avoid leaving stale pointers in memoryMichael Niedermayer2014-11-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb'Michael Niedermayer2014-11-12
|\| | | | | | | | | | | | | | | | | | | * commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb': tiff: Use av_mallocz_array Conflicts: libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: Use av_mallocz_arrayLuca Barbato2014-11-11
| | | | | | | | CC: libav-stable@libav.org
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avcodec/tiffenc: properly compute packet sizeChristophe Gisquet2014-10-22
| | | | | | | | | | | | | | | | | | | | | | The bytes per row is a better indication of it. Helps resolving ticket #3874 by fixing ffmpeg's encoder and transforming the issue in a issue with non-compliant decoders. ffmpeg's one is ok, but unfortunately, many others aren't handling correctly unusual chroma samplings. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '49106844929b7b71ac719064d640f8aa56c89b1f'Michael Niedermayer2014-06-18
|\| | | | | | | | | | | | | | | | | | | * commit '49106844929b7b71ac719064d640f8aa56c89b1f': tiffenc: fix packet size calculation Conflicts: libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiffenc: fix packet size calculationTristan Matthews2014-06-17
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavc/tiffenc: Enable frame-threading.Carl Eugen Hoyos2014-05-31
| |
* | Merge commit 'a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed'Michael Niedermayer2014-04-13
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed': tiff: use a better name and enum values for PhotometricInterpretation Conflicts: libavcodec/tiff.c libavcodec/tiff.h libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: use a better name and enum values for PhotometricInterpretationJustin Ruggles2014-04-12
| | | | | | | | Also add additional known values and log as missing features.
| * tiff: Support rgba encodingCarl Eugen Hoyos2014-03-16
| |
* | Consider aspect ratio when writing tiff dpi.Carl Eugen Hoyos2014-04-06
| | | | | | | | TIFFTAG_YRESOLUTION gets now adjusted to sample_aspect_ratio.
* | Merge commit '45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7'Michael Niedermayer2013-11-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7': sunrastenc: use the AVFrame API properly. targaenc: use the AVFrame API properly. tiffenc: use the AVFrame API properly. pngenc: use the AVFrame API properly. Conflicts: libavcodec/pngenc.c libavcodec/sunrastenc.c libavcodec/targaenc.c libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiffenc: use the AVFrame API properly.Anton Khirnov2013-11-16
| |
* | Merge commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee'Michael Niedermayer2013-06-03
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-02
| |
| * pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*Anton Khirnov2013-05-15
| |
* | Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'Michael Niedermayer2012-11-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2': x86: h264_weight_10bit: port to cpuflags libtheoraenc: add missing pixdesc.h header avcodec: remove ff_is_hwaccel_pix_fmt pixdesc: add av_pix_fmt_get_chroma_sub_sample hlsenc: stand alone hls segmenter Conflicts: doc/muxers.texi libavcodec/ffv1enc.c libavcodec/imgconvert.c libavcodec/mpegvideo_enc.c libavcodec/tiffenc.c libavformat/Makefile libavformat/allformats.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pixdesc: add av_pix_fmt_get_chroma_sub_sampleLuca Barbato2012-11-13
| | | | | | | | Deprecate avcodec_get_chroma_sub_sample.
| * lavc: do not use av_pix_fmt_descriptors directly.Anton Khirnov2012-10-12
| |
* | Write tiff tag YCbCrPositioning if chroma_sample_location is top-left.Carl Eugen Hoyos2012-11-05
| |
* | tiffenc: fix integer overflowMichael Niedermayer2012-10-19
| | | | | | | | | | Fixes CID700699 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: do not use av_pix_fmt_descriptors directlyPaul B Mahol2012-10-12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov2012-10-08
| |
* | tiffenc: remove unused variableMichael Niedermayer2012-10-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ARM: fix Thumb PIC on Apple nut: add do {} while (0) to GET_V tiffenc: Check av_malloc() results. tiffenc: Simplify pixel format setup using AVPixFmtDescriptor. Use atexit() instead of defining a custom exit_program() interface. msvc: Fix detection of VFW & Avisynth required libs Conflicts: ffmpeg.c ffmpeg_opt.c ffplay.c ffprobe.c ffserver.c libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiffenc: Check av_malloc() results.Alex Converse2012-10-01
| |
| * tiffenc: Simplify pixel format setup using AVPixFmtDescriptor.Alex Converse2012-10-01
| |
* | Merge commit '581281e242609a222233a2e5538b89dfb88fb18e'Michael Niedermayer2012-09-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '581281e242609a222233a2e5538b89dfb88fb18e': matroskadec: check realloc in lzo encoding matroska: honor error_recognition on unknown doctypes tiffdec: Add support for GRAY16LE. tiffenc: Add support for little endian RGB48 and GRAY16 mpeg4: support frame parameter changes with frame-mt mpegvideo: check ff_find_unused_picture() return value for errors mpegvideo: release frame buffers before freeing them configure: msvc: default to 'lib' as 'ar' tool build: support some non-standard ar variants Conflicts: libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/tiff.c libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiffenc: Add support for little endian RGB48 and GRAY16Alex Converse2012-09-19
| |
* | Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö2012-09-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '124134e42455763b28cc346fed1d07017a76e84e'Michael Niedermayer2012-09-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '124134e42455763b28cc346fed1d07017a76e84e': avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member Conflicts: libavcodec/aacenc.c libavcodec/libopenjpegenc.c libavcodec/options_table.h libavdevice/bktr.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/vf_drawtext.c libavformat/movenc.c libavformat/options_table.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union memberMartin Storsjö2012-09-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Write TIFF Tag ExtraSamples when encoding pix_fmts that contain transparency ↵Carl Eugen Hoyos2012-08-31
| | | | | | | | information.
* | Cosmetics: Reorder pix_fmts in tiffenc.c.Carl Eugen Hoyos2012-08-31
| |
* | Simplify setting colour space for mono* when encoding tiff.Carl Eugen Hoyos2012-08-31
| |