summaryrefslogtreecommitdiffstats
path: root/libavcodec/iff.c
Commit message (Collapse)AuthorAgeFilesLines
* iff/deep: fix rle32 on big-endianPiotr Bandurski2013-01-291-1/+1
| | | | | | Fixes ticket #2197. Signed-off-by: Peter Ross <pross@xvid.org>
* lavc/iff: rgbn: fix decoding on big endianPaul B Mahol2013-01-271-4/+4
| | | | | | Fixes #2193. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2'Michael Niedermayer2013-01-261-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2': mimic: cosmetics, reformat iff: drop ff_ prefix from a static function. pngdec: cosmetics, reformat. dxa: return meaningful error codes. eatgq: cosmetics, reformat. Conflicts: libavcodec/dxa.c libavcodec/eatgq.c libavcodec/iff.c libavcodec/mimic.c libavcodec/pngdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * iff: drop ff_ prefix from a static function.Anton Khirnov2013-01-261-3/+3
| |
* | lavc/iff: ilbm: unbreak decoding on big endianPaul B Mahol2013-01-261-1/+1
| | | | | | | | | | | | Fixes #2192. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | iff decoder: support RGB8 and RGBNPeter Ross2012-12-111-1/+70
| |
* | Merge commit 'df9b9567518f2840d79a4a96b447ebe1aa326408'Michael Niedermayer2012-12-051-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'df9b9567518f2840d79a4a96b447ebe1aa326408': lavc: fix decode_frame() third parameter semantics for video decoders Conflicts: libavcodec/cscd.c libavcodec/eamad.c libavcodec/ffv1dec.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/iff.c libavcodec/mjpegdec.c libavcodec/pcx.c libavcodec/vp56.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: fix decode_frame() third parameter semantics for video decodersAnton Khirnov2012-12-041-4/+4
| | | | | | | | It's got_frame, not data size
* | Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793'Michael Niedermayer2012-12-051-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '594d4d5df3c70404168701dd5c90b7e6e5587793': lavc: add a wrapper for AVCodecContext.get_buffer(). Conflicts: libavcodec/4xm.c libavcodec/8svx.c libavcodec/bmv.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/kmvc.c libavcodec/mpc7.c libavcodec/mpegaudiodec.c libavcodec/pcx.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/rl2.c libavcodec/snow.c libavcodec/targa.c libavcodec/tscc.c libavcodec/txd.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vb.c libavcodec/vmdav.c libavcodec/vp56.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add a wrapper for AVCodecContext.get_buffer().Anton Khirnov2012-12-041-2/+3
| | | | | | | | It will be useful in the upcoming transition to refcounted AVFrames.
* | iff decoder: DEEP TVDC 32-bit decoderPeter Ross2012-12-041-2/+66
| | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org>
* | iff: mention all decodersPiotr Bandurski2012-11-291-2/+2
| |
* | iff decoder: reindentPeter Ross2012-11-261-132/+132
| | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org>
* | iff decoder: merge iff ilbm and byterun1 decodersPeter Ross2012-11-261-105/+82
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com>
* | iff decoder: initialise HAM line decoder with first palette entryPeter Ross2012-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | The palette is organised into 'hold' and 'modify' pairs, hence why the first palette entry is pal[1]. Fixes ticket #1701. Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | replace av_log(0, by av_log(NULL,Michael Niedermayer2012-11-231-1/+1
| | | | | | | | | | | | The first parameter is a pointer and NULL is more correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | iff: DEEP RLE 32-bit decoderPeter Ross2012-11-201-0/+57
| | | | | | | | | | | | Fixes ticket #1046. Signed-off-by: Peter Ross <pross@xvid.org>
* | iff: decode HAM8 images with masking correctly.Piotr Bandurski2012-11-181-1/+1
| | | | | | | | | | | | Fixes ticket #967. Reviewed-by: Peter Ross
* | iff/ilbm: check remaining buffer size.Michael Niedermayer2012-11-091-2/+2
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | iff: avoid out of array reads, due to too many planes.Michael Niedermayer2012-11-091-0/+4
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff: fix case where image does not have alpha channelPaul B Mahol2012-10-301-2/+10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc: do not use av_pix_fmt_descriptors directlyPaul B Mahol2012-10-121-1/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-081-20/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-081-10/+10
| |
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-2/+2
| |
* | iffdec: Fix integer overflow.Michael Niedermayer2012-07-241-0/+5
| | | | | | | | | | Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cosmetics: iff: fix typoPaul B Mahol2012-07-231-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | iff: set ham palette alpha to 0xFFPeter Ross2012-07-231-9/+9
| | | | | | | | | | | | | | This addresses the problem that some HAM pictures were decoded with complete transparency as described in the 'iff: ANIM suppport ' thread on ffmpeg-devel. The decoder was already setting alpha correctly for CMAP palettes, just not HAM palettes.
* | lavc: build some codecs only if they are actually enabledPaul B Mahol2012-06-171-1/+4
| | | | | | | | | | | | Saves few bytes if only some of them in same file are enabled. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | iff: check if there is extradataPaul B Mahol2012-05-301-1/+6
| | | | | | | | | | | | Fixes #1368. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | iff_ilbm: fix null ptr derefMichael Niedermayer2012-05-281-3/+7
| | | | | | | | | | | | Fixes Ticket1362 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | iff: fix null ptr dereferenceMichael Niedermayer2012-04-221-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-071-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtpdec_asf: Set the no_resync_search option for the chained asf demuxer asfdec: Add an option for not searching for the packet markers cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others cosmetics: Align codec declarations cosmetics: Convert mimic.c to utf-8 avconv: remove an unused function parameter. avconv: remove now pointless variables. avconv: drop support for building without libavfilter. nellymoserenc: fix crash due to memsetting the wrong area. libavformat: Only require first packet to be known for audio/video streams avplay: Don't try to scale timestamps if the tb isn't set Conflicts: Changelog configure ffmpeg.c libavcodec/aacenc.c libavcodec/bmpenc.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/ffv1.c libavcodec/flacenc.c libavcodec/fraps.c libavcodec/huffyuv.c libavcodec/libopenjpegdec.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/pamenc.c libavcodec/pgssubdec.c libavcodec/pngenc.c libavcodec/qtrleenc.c libavcodec/rawdec.c libavcodec/sgienc.c libavcodec/tiffenc.c libavcodec/v210dec.c libavcodec/wmv2dec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Align codec declarationsMartin Storsjö2012-04-061-2/+2
| | | | | | | | | | | | | | Also break some long lines, remove codec function placeholder comments and add spaces in sample/pixel format lists. Signed-off-by: Martin Storsjö <martin@martin.st>
* | iff: prevent a possible crash with broken/prepared IFF PBMPiotr Bandurski2012-03-291-1/+4
| | | | | | | | | | | | Based on fix by Peter Ross for ticket #1054. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Match documentation for transparency in BGR32 iff images.Carl Eugen Hoyos2012-03-191-0/+5
| |
* | iff: do not decode unsupported pbms with ham decoderPeter Ross2012-03-131-1/+4
| | | | | | | | This prevents the segfault reported by ticket #1054
* | iff: check for pbm tagami_stuff2012-03-121-22/+26
| | | | | | | | | | | | more robust Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | iff: add support for IFF DEEPPiotr Bandurski2012-03-091-1/+9
| | | | | | | | | | | | | | | | | | Fixes trac #1045. Thanks to Peter Ross for his help with this patch. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | iff: Fix decode_ham_plane32() buf_size.Michael Niedermayer2012-02-141-2/+2
| | | | | | | | | | | | | | | | The wrong variable was passed into decode_ham_plane32() Fixes: Ticket922 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | iff: support masking plane featurePeter Ross2012-01-151-4/+54
| | | | | | | | | | | | | | | | Fixes ticket 705. Reported-by: ami-stuff Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support transparency in iff images.Carl Eugen Hoyos2012-01-141-4/+4
| | | | | | | | | | | | Fixes ticket #707. Reviewed-by: Peter Ross
* | iff: support ExtraHalfBrite (EHB) palette modePeter Ross2011-12-031-3/+5
| | | | | | | | | | | | | | | | Fixes ticket #663. Based on patch by ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | HAM6/HAM8 support for IFF ACBM decoderPeter Ross2011-11-271-0/+13
| | | | | | | | | | | | Based on patch by ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | iff: fix invalid reads (ticket 689)Peter Ross2011-11-271-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | [PATCH] IFF Amiga Continuous Bitmap (ACBM)decoderami_stuff2011-11-211-1/+12
| | | | | | | | | | | | | | | | | | | | Some sample IFF ACBM files can be found here: http://aminet.net/package/dev/basic/ABdemos Thanks to Peter Ross for his help with this patch. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Try to set AVFrame.reference to correct values.Reimar Döffinger2011-11-051-1/+1
| | | | | | | | | | | | | | | | | | I am not sure these new values are correct, not am I sure the semantics are a good idea since we do not seem to make any use of them but they caused a lot of confusion, but this seems to make things closer to matching the documentation. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-301-18/+16
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-18/+16
| | | | | | | | It's more readable and less prone to breakage.
OpenPOWER on IntegriCloud