summaryrefslogtreecommitdiff
path: root/libavcodec/iff.c
Commit message (Collapse)AuthorAge
* 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
| |
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-07
| |
* | iffdec: Fix integer overflow.Michael Niedermayer2012-07-24
| | | | | | | | | | Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cosmetics: iff: fix typoPaul B Mahol2012-07-23
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | iff: set ham palette alpha to 0xFFPeter Ross2012-07-23
| | | | | | | | | | | | | | 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-17
| | | | | | | | | | | | 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-30
| | | | | | | | | | | | Fixes #1368. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | iff_ilbm: fix null ptr derefMichael Niedermayer2012-05-28
| | | | | | | | | | | | Fixes Ticket1362 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | iff: fix null ptr dereferenceMichael Niedermayer2012-04-22
| | | | | | | | | | 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-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-06
| | | | | | | | | | | | | | 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-29
| | | | | | | | | | | | 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-19
| |
* | iff: do not decode unsupported pbms with ham decoderPeter Ross2012-03-13
| | | | | | | | This prevents the segfault reported by ticket #1054
* | iff: check for pbm tagami_stuff2012-03-12
| | | | | | | | | | | | more robust Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | iff: add support for IFF DEEPPiotr Bandurski2012-03-09
| | | | | | | | | | | | | | | | | | 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-14
| | | | | | | | | | | | | | | | 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-15
| | | | | | | | | | | | | | | | 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-14
| | | | | | | | | | | | Fixes ticket #707. Reviewed-by: Peter Ross
* | iff: support ExtraHalfBrite (EHB) palette modePeter Ross2011-12-03
| | | | | | | | | | | | | | | | 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-27
| | | | | | | | | | | | Based on patch by ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | iff: fix invalid reads (ticket 689)Peter Ross2011-11-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | [PATCH] IFF Amiga Continuous Bitmap (ACBM)decoderami_stuff2011-11-21
| | | | | | | | | | | | | | | | | | | | 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-05
| | | | | | | | | | | | | | | | | | 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-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-29
| | | | | | | | It's more readable and less prone to breakage.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Merge libavcore into libavutilReinhard Tartler2011-02-15
| | | | | | | | | | | | | | | | | | | | | | | | 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-26
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Make ff_cmap_read_palette static to libavcodec/iff.c. Delete iff.h.Diego Elio Pettenò2011-01-26
| | | | | | | | | | | | | | | | The iff.h header only declared one function that is now static, the libavformat/iff.c source file wasn't using it before. Drop the file entirely. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | iff: remove get_image_data() and get_image_size() wrappersStefano Sabatini2011-05-11
| | | | | | | | Remove one level of indirection, simplify code.
* | iff: remove get_palette_size() wrapperStefano Sabatini2011-05-11
| | | | | | | | Remove one level of indirection/improve readability.
* | iff: remove pointless get_palette_data() wrapperStefano Sabatini2011-05-11
| | | | | | | | | | Also rename variable "extradata" to "palette" ff_cmap_read_palette() and extract_header(), more meaningful.
* | lavc: set defaults in internal codec framesStefano Sabatini2011-05-07
| | | | | | | | | | | | | | | | | | This is required specifically for setting frame->format to -1, otherwise it will be set to 0 = PIX_FMT_YUV420P and code reading the format from the output decoded frame will get misled. In particular fix regressions occurring with the pending vsrc_buffer patch.
* | HAM6/HAM8 support for IFF demuxer/decoderSebastian Vater2011-04-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge libavcore into libavutilReinhard Tartler2011-02-16
| | | | | | | | 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-28
| | | | | | | | | | | | | | | | 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)
* | Make ff_cmap_read_palette static to libavcodec/iff.c. Delete iff.h.Diego Elio Pettenò2011-01-28
|/ | | | | | | | | The iff.h header only declared one function that is now static, the libavformat/iff.c source file wasn't using it before. Drop the file entirely. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 2d162e3825a35b6ac42a27d27c4a3ebbd141828d)
* Use new imgutils.h API names, fix deprecation warnings.Stefano Sabatini2010-09-07
| | | | Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove use of the deprecated function avcodec_check_dimensions(), useStefano Sabatini2010-08-06
| | | | | | av_check_image_size() instead. Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
* bswap: change ME to NE in macro namesMåns Rullgård2010-07-10
| | | | | | | Other parts of FFmpeg use NE (native endian) rather than ME (machine). This makes it consistent. Originally committed as revision 24169 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix grammar errors in documentationMåns Rullgård2010-06-30
| | | | Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* IFF PBM decoder: Add a pad byte if image width is odd <aleksi dot nurmi at ↵Peter Ross2010-06-22
| | | | | | gmail dot com> Originally committed as revision 23701 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move get_buffer() calls from decode_init() to decode_frame(). Anything else isSebastian Vater2010-06-01
| | | | | | | | unsupported and causes crashes when libavfilter is enabled. Patch by Sebastian Vater <cdgs basty googlemail com>. Originally committed as revision 23411 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorize code into a single function.Sebastian Vater2010-05-16
| | | | | | Patch by Sebastian Vater, cdgs D basty A gmail Originally committed as revision 23148 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reindent after r23124. Patch by Sebastian Vater <cdgs basty googlemail com>.Sebastian Vater2010-05-13
| | | | Originally committed as revision 23128 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Grayscale support. Patch by Sebastian Vater <cdgs basty googlemail com>.Sebastian Vater2010-05-13
| | | | Originally committed as revision 23124 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 03:47:01 +0000