summaryrefslogtreecommitdiff
path: root/libavcodec/xan.c
Commit message (Collapse)AuthorAge
* 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
| |
* | xan: fix out of array readMichael Niedermayer2012-05-28
| | | | | | | | | | | | Fixes ticket1360 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xan: check for vector_segment overreadMichael Niedermayer2012-04-15
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Make the palette in Wing Commander III mve files opaque.Carl Eugen Hoyos2011-12-24
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: fix standalone compilation of OMA muxer build: fix standalone compilation of Microsoft XMV demuxer build: fix standalone compilation of Core Audio Format demuxer kvmc: fix invalid reads 4xm: Add a check in decode_i_frame to prevent buffer overreads adpcm: fix IMA SMJPEG decoding options: set minimum for "threads" to zero bsd: use number of logical CPUs as automatic thread count windows: use number of CPUs as automatic thread count linux: use number of CPUs as automatic thread count pthreads: reset active_thread_type when slice thread_init returrns early v410dec: include correct headers Drop ALT_ prefix from BITSTREAM_READER_LE name. lavfi: always build vsrc_buffer. ra144enc: zero the reflection coeffs if the filter is unstable sws: readd PAL8 to isPacked() mov: Don't stick the QuickTime field ordering atom in extradata. truespeech: fix invalid reads in truespeech_apply_twopoint_filter() Conflicts: configure libavcodec/4xm.c libavcodec/avcodec.h libavfilter/Makefile libavfilter/allfilters.c libavformat/Makefile libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Drop ALT_ prefix from BITSTREAM_READER_LE name.Diego Biurrun2011-12-22
| | | | | | | | | | The prefix is a historic remnant that probably meant "alternative". Now that the A32 bitstream reader has been dropped it makes no sense anymore.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: adpcmenc: cosmetics: pretty-printing ac3dec: cosmetics: pretty-printing yuv4mpeg: cosmetics: pretty-printing shorten: remove dead initialization roqvideodec: set AVFrame reference before reget_buffer. bmp: fix some 1bit samples. latmdec: add fate test for audio config change oma: PCM support oma: better format detection with small probe buffer oma: clearify ambiguous if condition wavpack: Properly clip samples during lossy decode Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c. Cleaned pixdesc.c file in libavutil zmbv.c: coding style clean-up. xan.c: coding style clean-up. mpegvideo.c: code cleanup - first 500 lines. Conflicts: Changelog libavcodec/adpcmenc.c libavcodec/bmp.c libavcodec/zmbv.c libavutil/log.c libavutil/pixdesc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xan.c: coding style clean-up.Nathan Adil Maxson2011-12-03
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (24 commits) mpegps: Use av_get_packet() instead of poorly emulating it. motionpixels: decode only the 111 complete frames for fate mpc8: Check out of bound bands limit xan: Prevent NULL dereference with missing palette xan: Check for out of bound reads in xan_huffman_decode() xan: Fixed out of bound accesses in xan_unpack() motionpixels: Prevent calling init_vlc() with invalid parameters shorten: Fix out of bound writes in fix_bitshift() dsicinav: Check for out of bounds writes tiertexseqv: Check for out of bound reads quickdraw: Check for out of bound reads dsicinav: Check for out of bounds reads motionpixels: Fix the size of workspace buffers motionpixels: Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer wmavoice: Check for corrupted extra data wmavoice: Check for out of bound writes xan: Prevent NULL dereferences with missing reference frame bink: Prevent NULL dereferences with missing reference frame wavpack: Reset internal state on corrupted blocks wmapro: Validate the number of audio channels before using it ... Conflicts: libavcodec/h264.c libavcodec/xan.c tests/ref/fate/motionpixels Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xan: Prevent NULL dereference with missing paletteLaurent Aimar2011-10-07
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * xan: Check for out of bound reads in xan_huffman_decode()Laurent Aimar2011-10-07
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * xan: Fixed out of bound accesses in xan_unpack()Laurent Aimar2011-10-07
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * xan: Prevent NULL dereferences with missing reference frameLaurent Aimar2011-10-07
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * xan: Prevent out of bound accessesLaurent Aimar2011-10-07
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | Check for out of bound reads in xan_huffman_decode() of the xan decoder.Laurent Aimar2011-09-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Prevent NULL dereference when the palette is missing in the xan decoder.Laurent Aimar2011-09-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fixed out of bound accesses in xan_unpack() of the xan decoder.Laurent Aimar2011-09-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Prevent out of bound accesses in the xan decoder.Laurent Aimar2011-09-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Prevent NULL dereferences when missing the reference frame in the xan decoder.Laurent Aimar2011-09-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: sws: implement MMX/SSE2/SSSE3/SSE4 versions for horizontal scaling. include stdint.h in adpcm_data.h mpeg12: reorder functions to avoid ugly forward declarations Fixed off by one packet size allocation in the smacker demuxer. Check for invalid packet size in the smacker demuxer. ape demuxer: fix segfault on memory allocation failure. xan: Add some buffer checks xan: Remove extra trailing newline Fixed size given to init_get_bits() in xan decoder. Conflicts: libavcodec/mpeg12.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xan: Add some buffer checksAlex Converse2011-09-12
| |
| * xan: Remove extra trailing newlineAlex Converse2011-09-12
| |
| * Fixed size given to init_get_bits() in xan decoder.Laurent Aimar2011-09-12
| |
* | 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>
| * Remove Xan WC4 cruft from xan.cKostya2011-02-07
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * 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>
* | 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.
* | Remove Xan WC4 cruft from xan.cKostya2011-02-09
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 90e8a9c34f641d0cb9137190c1912a3da3095e01)
* | 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)
* Fix memleak: free palette data on close.Reimar Döffinger2010-11-23
| | | | Originally committed as revision 25816 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix indentation.Reimar Döffinger2010-11-21
| | | | Originally committed as revision 25780 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add explanation and alternative implementation for strange xanReimar Döffinger2010-11-21
| | | | | | gamma correction. Originally committed as revision 25779 to svn://svn.ffmpeg.org/ffmpeg/trunk
* WC3/xan: move palette handling to decoder, avoiding need forReimar Döffinger2010-11-21
| | | | | | | | PaletteControl. This also fixes playback of some files with ffplay (images were corrupted for a short time after a palette change). Originally committed as revision 25778 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove redundant text in the log.Stefano Sabatini2010-10-18
| | | | Originally committed as revision 25517 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make XAN decoder return meaningful error codes.Stefano Sabatini2010-10-18
| | | | Originally committed as revision 25516 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-20
| | | | | | | | 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-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add long_name for Xxan codec.Diego Biurrun2009-12-19
| | | | Originally committed as revision 20900 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Improve handling allocated buffers in Xan decoderKostya Shishkov2009-12-19
| | | | Originally committed as revision 20899 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: reindent a bitKostya Shishkov2009-12-19
| | | | Originally committed as revision 20898 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unnecessary calls to avcodec_check_dimensions, the check is alreadyReimar Döffinger2009-10-13
| | | | | | done at a higher level. Originally committed as revision 20229 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use memcpy to copy till end of line in one go instead of copying pixel by pixelReimar Döffinger2009-09-05
| | | | | | in xan_wc3_output_pixel_run and xan_wc3_copy_pixel_run Originally committed as revision 19774 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Slightly simplify detection of end of compressed data in xan_unpackReimar Döffinger2009-09-05
| | | | Originally committed as revision 19772 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove useless #include <unistd.h> from many filesMåns Rullgård2009-07-22
| | | | Originally committed as revision 19499 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Avoid code duplication in xan_unpack for the final memcpy.Reimar Döffinger2009-04-18
| | | | Originally committed as revision 18608 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 23:13:33 +0000