summaryrefslogtreecommitdiffstats
path: root/libavcodec/pnm.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4'Michael Niedermayer2013-01-071-9/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '57d11e5e28bfe0bc445ad78fc033aafa73068bb4': fraps: return meaningful error codes. kgv1dec: return meaningful error codes. kmvc: return meaningful error codes. wnv1: return meaningful error codes. dpx: return meaningful error codes. truemotion1: return meaningful error codes pnm: return meaningful error codes. Conflicts: libavcodec/dpx.c libavcodec/fraps.c libavcodec/kmvc.c libavcodec/pnm.c libavcodec/pnmdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pnm: return meaningful error codes.Anton Khirnov2013-01-061-11/+11
| |
* | pnm: cosmetics: reindentPaul B Mahol2012-11-041-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | pnm: remove duplicated check for maxval > 255Paul B Mahol2012-11-041-2/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | pnm: remove nonsense codePaul B Mahol2012-11-041-2/+0
| | | | | | | | | | | | | | If maxval is more than 255 than each value takes 2 bytes with most significant byte first. 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-17/+17
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-161-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Don't include common.h from avutil.hMartin Storsjö2012-08-151-0/+3
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1/+1
| |
* | pnmdec: make ff_pnm_decode_header() more robustMichael Niedermayer2012-08-071-6/+8
| | | | | | | | | | | | Fixes ticket1321 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pnmdec: make pnm_get more robustMichael Niedermayer2012-08-071-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-031-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) amrwb: remove duplicate arguments from extrapolate_isf(). amrwb: error out early if mode is invalid. h264: change underread for 10bit QPEL to overread. matroska: check buffer size for RM-style byte reordering. vp8: disable mmx functions with sse/sse2 counterparts on x86-64. vp8: change int stride to ptrdiff_t stride. wma: fix invalid buffer size assumptions causing random overreads. Windows Media Audio Lossless decoder rv10/20: Fix slice overflow with checked bitstream reader. h263dec: Disallow width/height changing with frame threads. rv10/20: Fix a buffer overread caused by losing track of the remaining buffer size. rmdec: Honor .RMF tag size rather than assuming 18. g722: Fix the QMF scaling r3d: don't set codec timebase. electronicarts: set timebase for tgv video. electronicarts: parse the framerate for cmv video. ogg: don't set codec timebase electronicarts: don't set codec timebase avs: don't set codec timebase wavpack: Fix an integer overflow ... Conflicts: libavcodec/arm/vp8dsp_init_arm.c libavcodec/fraps.c libavcodec/h264.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/msmpeg4.c libavcodec/pnmdec.c libavcodec/qpeg.c libavcodec/rawenc.c libavcodec/ulti.c libavcodec/vcr1.c libavcodec/version.h libavcodec/wmalosslessdec.c libavformat/electronicarts.c libswscale/ppc/yuv2rgb_altivec.c tests/ref/acodec/g722 tests/ref/fate/ea-cmv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove unnecessary AVFrame pointer casts.Diego Biurrun2012-03-011-2/+2
| |
* | pamdec: fix mono support.Michael Niedermayer2012-02-191-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-231-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (25 commits) riff: fix invalid av_freep() calls on EOF in ff_read_riff_info pam: Fix a typo that broke writing and reading PAM files. mxfdec: fix memleak on av_realloc failures mxfdec: Do not parse slices or DeltaEntryArrays. mxfdec: hybrid demuxing/seeking solution mxfdec: Add Avid's essence element key. mfxdec: Separate mxf_essence_container_uls for audio and video. mxfdec: Compute packet offsets properly. mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack. mxfdec: use av_dlog() for 'no corresponding source package found' mxfdec: Make mxf->partitions sorted by offset. mxfdec: parse ThisPartition mxfdec: Speed up metadata and index parsing. mxfdec: Make sure DataDefinition is consistent between material track and source track. mxfdec: add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf mxfdec: Add hack that adjusts the n_delta calculation when system items are present. mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays. mxfdec: Move FooterPartition to MXFContext and make sure it is never zero. mxfdec: check return value of avio_seek mxfdec: skip to end of structural sets ... Conflicts: configure libavcodec/pnm.c libavformat/mxfdec.c libavformat/riff.c libavformat/rtsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pam: Fix a typo that broke writing and reading PAM files.Carl Eugen Hoyos2012-01-221-1/+3
| | | | | | | | | | | | Reported and reviewed by Derek Buitenhuis. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * 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>
* | Simplify 32bit pam decoding.Carl Eugen Hoyos2012-01-191-1/+1
| | | | | | | | Reviewed-by: Paul B Mahol
* | Support 64bit pam decoding.Carl Eugen Hoyos2012-01-171-2/+1
| |
* | Support gray8a pam decoding.Carl Eugen Hoyos2012-01-171-0/+3
| |
* | Cosmetics: Fix indentation.Carl Eugen Hoyos2012-01-071-2/+2
| | | | | | | | Found by: Alexander Strasser
* | pam: Reject 64bpp rgba.ami_stuff2012-01-061-1/+6
| | | | | | | | Fixes ticket #883
* | Support 48bpp pam decoding.ami_stuff2012-01-051-3/+1
| | | | | | | | Fixes ticket #882.
* | Support 16bpp grayscale pam decoding.ami_stuff2012-01-051-2/+5
| | | | | | | | Fixes ticket #881.
* | Fix a crash when reading gray pam files.Carl Eugen Hoyos2011-12-281-0/+1
| | | | | | | | Fixes ticket #837.
* | Fix a typo that broke writing (and reading) PAM files.Carl Eugen Hoyos2011-12-281-1/+3
| | | | | | | | Reported and reviewed by Derek Buitenhuis.
* | pnm: Fix spurious error message.Michael Niedermayer2011-05-081-1/+1
| | | | | | | | 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
* Do not stop decoding on pnm files with negative maxval.Carl Eugen Hoyos2011-01-101-1/+1
| | | | Originally committed as revision 26304 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check for invalid maxval in pgm decoder, fixes issue 2518.Daniel Kang2011-01-101-0/+4
| | | | | | Patch by Daniel Kang, daniel.d.kang at gmail Originally committed as revision 26292 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
* Support ASCII pnms.Michael Niedermayer2009-12-011-5/+10
| | | | | | Implements issue1452. Originally committed as revision 20687 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move PNM init/end functions to the PNM common code.Diego Biurrun2009-10-271-0/+20
| | | | | | This is done in preparation for the PNM encoder/decoder split. Originally committed as revision 20382 to svn://svn.ffmpeg.org/ffmpeg/trunk
* whitespace cosmetics: K&R coding style, prettyprintingDiego Biurrun2009-10-271-8/+10
| | | | Originally committed as revision 20381 to svn://svn.ffmpeg.org/ffmpeg/trunk
* pnm: Add missing 'else'. Fixes decoding for 16-bit pgm.Justin Ruggles2009-03-061-1/+1
| | | | Originally committed as revision 17848 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Support 48-bit RGB PPM image.Peter Ross2009-02-221-1/+4
| | | | Originally committed as revision 17511 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-191-1/+1
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: fix indentation after r15321Justin Ruggles2008-09-141-3/+3
| | | | Originally committed as revision 15332 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Return error when trying to decode non-grayscale 16-bit PNM images.Justin Ruggles2008-09-141-1/+13
| | | | | | Fixes issue 566. Originally committed as revision 15321 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unnecessary parentheses from return calls.Diego Biurrun2008-05-061-1/+1
| | | | Originally committed as revision 13069 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rename pnm.c to pnmenc.c and pnm_common.c to pnm.cAurelien Jacobs2007-05-111-383/+104
| | | | Originally committed as revision 8996 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move pnm parser in its own fileAurelien Jacobs2007-05-101-204/+2
| | | | Originally committed as revision 8988 to svn://svn.ffmpeg.org/ffmpeg/trunk
* make some parser parameters const to avoid casting const to non-constAurelien Jacobs2007-05-071-3/+3
| | | | Originally committed as revision 8921 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics after last commitIvo van Poorten2007-04-101-1/+1
| | | | Originally committed as revision 8705 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add support for grayscale images with arbitrary maxvals.Ivo van Poorten2007-04-101-2/+24
| | | | | | | | The image data is rescaled to the nearest pix_fmt it will fit in (gray8 or gray16). Conversion is done inside the codec in order to avoid the need for 14 (or 65534) new pix_fmt's. Originally committed as revision 8704 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace deprecated PIX_FMT names by the newer variants.Diego Biurrun2007-02-071-5/+5
| | | | Originally committed as revision 7867 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud