summaryrefslogtreecommitdiffstats
path: root/libavcodec/tiff.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-301-10/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata. H.264: tweak some other x86 asm for Atom probe: Fix insane flow control. mpegts: remove invalid error check s302m: use nondeprecated audio sample format API lavc: use designated initialisers for all codecs. x86: cabac: add operand size suffixes missing from 6c32576 Conflicts: libavcodec/ac3enc_float.c libavcodec/flacenc.c libavcodec/frwu.c libavcodec/pictordec.c libavcodec/qtrleenc.c libavcodec/v210enc.c libavcodec/wmv2dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use designated initialisers for all codecs.Anton Khirnov2011-07-291-10/+8
| | | | | | | | It's more readable and less prone to breakage.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-151-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-061-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Remove some unused scripts from tools/. Add x86 assembly for some 10-bit H.264 intra predict functions. v4l2: do not force NTSC as standard Skip tableprint.h during 'make checkheaders'. Remove unnecessary LIBAVFORMAT_BUILD #ifdef. Drop explicit filenames from @file Doxygen tags. Skip generated table headers during 'make checkheaders'. lavf,lavc: free avoptions in a generic way. AVOptions: add av_opt_free convenience function. tableprint: Restore mistakenly deleted common.h #include for FF_ARRAY_ELEMS. tiff: print log in case of unknown / unsupported tag. tiff: fix linesize for mono-white/black formats. Fix build of eval-test program configure: Document --enable-vaapi ac3enc: extract all exponents for the frame at once Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: print log in case of unknown / unsupported tag.Stefano Sabatini2011-06-051-0/+2
| | | | | | | | | | | | Helps debugging. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * tiff: fix linesize for mono-white/black formats.Stefano Sabatini2011-06-051-1/+1
| | | | | | | | | | | | Fix decoding of file Test_1bpp.tif Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-251-10/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) configure: enable memalign_hack automatically when needed swscale: unbreak the build on non-x86 systems. swscale: remove if(bitexact) branch from functions. swscale: remove if(canMMX2BeUsed) conditional. swscale: remove swScale_{c,MMX,MMX2} duplication. swscale: use emms_c(). Move emms_c() from libavcodec to libavutil. tiff: set palette in the context when specified in TIFF_PAL tag rtsp: use strtoul to parse rtptime and seq values. pgssubdec: fix incorrect colors. dvdsubdec: fix incorrect colors. ape: Allow demuxing of files with metadata tags. swscale: remove dead macro WRITEBGR24OLD. swscale: remove AMD3DNOW "optimizations". swscale: remove duplicate code in ppc/ subdirectory. swscale: remove duplicated x86/ functions. swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*. vsrc_buffer.h: add file doxy vsrc_buffer: tweak error message in init() msmpeg4: reindent. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: set palette in the context when specified in TIFF_PAL tagStefano Sabatini2011-05-241-10/+13
| | | | | | | | | | | | | | | | | | | | | | Since image initialization was moved after tag parsing, the palette needs to be specified in the context and then copied to the allocated image in init_image(). Fixes a regression with TIFF images that have palette data, trac issue #230, file Test_Flate_8bpp.tif. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | tiff: fix linesize for mono-white/black formatsStefano Sabatini2011-05-131-1/+1
| | | | | | | | Fix decoding of file Test_1bpp.tif, fix trac issue #171.
* | tiff: print log in case of unknown / unsupported tagStefano Sabatini2011-05-131-0/+3
| | | | | | | | Helps debugging.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-131-57/+65
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (33 commits) rtpdec_qdm2: Don't try to parse data packet if no configuration is received ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand. ac3enc: clean up count_frame_bits() and count_frame_bits_fixed() mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame. srtdec: make sure we don't write past the end of buffer wmaenc: improve channel count and bitrate error handling in encode_init() matroskaenc: make sure we don't produce invalid file with no codec ID matroskadec: check that pointers were initialized before accessing them lavf: fix function name in compute_pkt_fields2 av_dlog message lavf: fix av_find_best_stream when providing a wanted stream. lavf: fix av_find_best_stream when decoder_ret is given and using a related stream. ffmpeg: factorize quality calculation tiff: add support for SamplesPerPixel tag in tiff_decode_tag() tiff: Prefer enum TiffCompr over int for TiffContext.compr. mov: Support edit list atom version 1. configure: Enable libpostproc automatically if GPL code is enabled. Cosmetics: fix prototypes in oggdec oggdec: fix memleak with continuous streams. matroskaenc: add missing new line in av_log() call dnxhdenc: add AVClass in private context. ... swscale changes largely rewritten by me or replaced by baptsites due to lots of bugs in ronalds code. Above code is also just in case its not obvios to a large extended duplicates that where cherry picked from ffmpeg. Conflicts: configure ffmpeg.c libavformat/matroskaenc.c libavutil/pixfmt.h libswscale/ppc/swscale_template.c libswscale/swscale.c libswscale/swscale_template.c libswscale/utils.c libswscale/x86/swscale_template.c tests/fate/h264.mak tests/ref/lavfi/pixdesc_le tests/ref/lavfi/pixfmts_copy_le tests/ref/lavfi/pixfmts_null_le tests/ref/lavfi/pixfmts_scale_le tests/ref/lavfi/pixfmts_vflip_le Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: add support for SamplesPerPixel tag in tiff_decode_tag()Stefano Sabatini2011-05-121-57/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | Format detection and internal frame initialization is moved to a separate init_image() function, which is called when all the tags have been read, and so both BitsPerSample and SamplesPerPixel information has been collected. This fixes decoding of the file 11.tiff from roundup issue #1925. Based on a patch by Kostya Shishkov <kostya.shishkov@gmail.com>. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * tiff: Prefer enum TiffCompr over int for TiffContext.compr.Stefano Sabatini2011-05-121-1/+1
| | | | | | | | | | | | This is safer and helps debugging. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-121-1/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (32 commits) 10-bit H.264 x86 chroma v loopfilter asm Port SMPTE S302M audio decoder from FFmbc 0.3. [Copyright headers corrected] Fix crash of interlaced MPEG2 decoding h264pred: fix one more aliasing violation. doc/APIchanges: fill in missing hashes and dates. flacenc: use proper initializers for AVOption default values. lavc: deprecate named constants for deprecated antialias_algo. aac: workaround for compilation on cygwin swscale: extend YUV422p support to 10bits depth tiff: add support for inverted FillOrder for uncompressed data Remove unused softfloat implementation. h264pred: fix aliasing violations. rotozoom: Eliminate French variable name. rotozoom: Check return value of fread(). rotozoom: Return an error value instead of calling exit(). rotozoom: Make init_demo() return int and check for errors on invocation. rotozoom: Drop silly UINT8 typedef. rotozoom: Drop some unnecessary parentheses. rotozoom: K&R coding style cosmetics rtsp: Only do keepalive using GET_PARAMETER if the server supports it ... Conflicts: Changelog cmdutils.c doc/APIchanges doc/general.texi ffmpeg.c ffplay.c libavcodec/h264pred_template.c libavcodec/resample.c libavutil/pixfmt.h libavutil/softfloat.c libavutil/softfloat.h tests/rotozoom.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: add support for inverted FillOrder for uncompressed dataStefano Sabatini2011-05-111-1/+7
| | | | | | | | | | | | Fix decoding of file b.tif, trac issue #168. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Merge libavcore into libavutilReinhard Tartler2011-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-261-1/+1
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | tiff: prefer enum TiffCompr over int for TiffContext.comprStefano Sabatini2011-05-111-1/+1
| | | | | | | | Help debugging, safer.
* | tiff: remove duplicated author information, fix @file doxyStefano Sabatini2011-05-111-3/+1
| |
* | Set alpha of palettes to 0xff.Baptiste Coudurier2011-04-271-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge libavcore into libavutilReinhard Tartler2011-02-161-1/+1
| | | | | | | | Done to keep ABI compatible. Otherwise this is just silly
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-281-1/+1
|/ | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit d36beb3f6902b1217beda576aa18abf7eb72b03c)
* Return on negative soff sizes, fixes issue 2515.Daniel Kang2011-01-091-0/+4
| | | | | | Patch by Daniel Kang, daniel.d.kang at gmail Originally committed as revision 26288 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix a crash when decoding tiff by moving checkDaniel Kang2011-01-061-4/+4
| | | | | | | | | for invalid header up before reading data. Fixes issue 2500. Patch by Daniel Kang, daniel.d.kang at gmail Originally committed as revision 26248 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix crash for files with strip size larger than the buffer.Daniel Kang2011-01-061-0/+5
| | | | | | | | Fixes issue 2498. Patch by Daniel Kang, daniel.d.kang at gmail Originally committed as revision 26243 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use new imgutils.h API names, fix deprecation warnings.Stefano Sabatini2010-09-071-2/+2
| | | | Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove use of the deprecated function avcodec_check_dimensions(), useStefano Sabatini2010-08-061-2/+3
| | | | | | av_check_image_size() instead. Originally committed as revision 24711 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
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-301-1/+1
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* lzw.h does not need get_bits.h, tiff.c needs intreadwrite.h for AV_R* thoughBaptiste Coudurier2009-12-031-1/+1
| | | | Originally committed as revision 20724 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move ff_reverse in libavcodec to av_reverse in libavutil.Francesco Lavra2009-11-091-1/+2
| | | | | | Patch by Francesco Lavra, francescolavra interfree it Originally committed as revision 20484 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not attempt to decode TIFF files containing fax data with uncompressedKostya Shishkov2009-10-011-0/+5
| | | | | | mode allowed for there is no code to decode it (yet). Originally committed as revision 20114 to svn://svn.ffmpeg.org/ffmpeg/trunk
* When BitsPerSample tag is not present in TIFF, that means file isKostya Shishkov2009-09-301-2/+13
| | | | | | | monochrome, so initialize picture before decoding. This fixes decoding monochrome files produced by lavc TIFF encoder. Originally committed as revision 20091 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-3/+1
| | | | | | | will be decoded correctly. This fixes issue 1423. Originally committed as revision 20065 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make TIFF decoder load compression options only for corresponding codecKostya Shishkov2009-09-281-1/+5
| | | | Originally committed as revision 20064 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not compile ZLib data uncompressing function in TIFF decoder when ZLib isMartin Storsjö2009-09-271-0/+2
| | | | | | | | not present. Patch by Martin Storsjö ($firstname <at> $firstname <dot> two first letters of $lastname) Originally committed as revision 20058 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data,Kostya Shishkov2009-09-271-2/+25
| | | | | | | so replace it with custom code. This fixes issue 1419. Originally committed as revision 20054 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Support both LSB and MSB orders for TIFF CCITT G.x compressed data.Kostya Shishkov2009-09-241-2/+15
| | | | | | This fixes issue 1410. Originally committed as revision 20016 to svn://svn.ffmpeg.org/ffmpeg/trunk
* tiff image decoder uses get_buffer, set CODEC_CAP_DR1Baptiste Coudurier2009-06-051-1/+1
| | | | Originally committed as revision 19108 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check combined depth and number of components in TIFF decoder, thus eliminatingKostya Shishkov2009-06-021-18/+15
| | | | | | additional checks for each depth (like 48-bit gray vs. 48-bit RGB) Originally committed as revision 19076 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add 32-bit RGB support to TIFF decoder and extend a bit 'unsupported format' ↵Kostya Shishkov2009-05-061-1/+9
| | | | | | message Originally committed as revision 18755 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove useless assignment during initialization for some decodersKostya Shishkov2009-04-241-1/+0
| | | | Originally committed as revision 18680 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes anThilo Borgmann2009-04-071-1/+3
| | | | | | | | | | | AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows passing of packet-specific flags from demuxer to decoder, such as the keyframe flag, which appears necessary to playback corePNG P-frames. Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread "Google Summer of Code participation" on the mailinglist. Originally committed as revision 18351 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
* Change semantic of CONFIG_*, HAVE_* and ARCH_*.Aurelien Jacobs2009-01-131-3/+3
| | | | | | They are now always defined to either 0 or 1. Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Enable faxcompr.Michael Niedermayer2008-12-261-9/+35
| | | | Originally committed as revision 16349 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Decode TIFF image only after all tags have been decodedKostya Shishkov2008-12-221-44/+50
| | | | Originally committed as revision 16268 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Some TIFFs declare -1 for the single strip heightKostya Shishkov2008-12-221-0/+2
| | | | Originally committed as revision 16267 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud