summaryrefslogtreecommitdiff
path: root/libavcodec/indeo3.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-08
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) cabac: Move code only used within the CABAC test program into the test program. vp56: Drop unnecessary cabac.h #include. h264-test: Initialize AVCodecContext.av_class. build: Skip compiling network.h and rtsp.h if networking is not enabled. cosmetics: drop some pointless parentheses Disable annoying warning without changing behavior faq: Solutions for common problems with sample paths when running FATE. avcodec: attempt to clarify the CODEC_CAP_DELAY documentation avcodec: fix avcodec_encode_audio() documentation. FATE: xmv-demux test; exercise the XMV demuxer without decoding the perceptual codecs inside. vqf: recognize more metadata chunks FATE test: BMV demuxer and associated video and audio decoders. FATE: indeo4 video decoder test. FATE: update xxan-wc4 test to a sample with more code coverage. Change the recent h264_mp4toannexb bitstream filter test to output to an elementary stream rather than a program stream. g722enc: validate AVCodecContext.trellis g722enc: set frame_size, and also handle an odd number of input samples g722enc: split encoding into separate functions for trellis vs. no trellis mpegaudiodec: Use clearer pointer math tta: Fix returned error code at EOF ... Conflicts: libavcodec/h264.c libavcodec/indeo3.c libavcodec/interplayvideo.c libavcodec/ivi_common.c libavcodec/libxvidff.c libavcodec/mpegvideo.c libavcodec/ppc/mpegvideo_altivec.c libavcodec/tta.c libavcodec/utils.c libavfilter/vsrc_buffer.c libavformat/Makefile tests/fate/indeo.mak tests/ref/acodec/g722 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo3: check motion vectors for validityJanne Grunau2012-01-07
| | | | | | | | | | | | Fixes null pointer dereferences in fuzzed files found by Oana Stratulat. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * indeo3: check per-plane data buffer against input buffer bounds.Aneesh Dogra2011-11-29
| | | | | | | | | | | | Fixes : http://bugzilla.libav.org/show_bug.cgi?id=102 Signed-off-by: Alex Converse <alex.converse@gmail.com>
* | indeo3: Fix null ptr dereferenceMichael Niedermayer2011-12-21
| | | | | | | | | | | | | | Fixes Ticket804 Bug found by: Oana Stratulat Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | indeo3: check return values of allocate_frame_buffers()Michael Niedermayer2011-12-15
| | | | | | | | | | | | Bug Found by: Diana Elena Muscalu Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: adtsenc: Check frame size. txd: Fix order of operations. APIchanges: fill in some blanks timer: fix misspelling of "decicycles" Eliminate pointless 0/NULL initializers in AVCodec and similar declarations. indeo3: cosmetics md5proto: Fix order of operations. dca: Replace oversized unused get_bits() with skip_bits_long(). Conflicts: doc/APIchanges libavformat/mmsh.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo3: cosmeticsKostya Shishkov2011-11-28
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vc1: use an enum for Frame Coding Mode doc: cleanup filter section indeo3: error out if no motion vector is set. x86inc: Flag shufps as an floating-point instruction for the AVX emulation code. mpegaudio: do not use init_static_data() for initializing tables. musepack: fix signed shift overflow in mpc_read_packet() mov: Make format string match variable type. wmavoice: Make format string match variable type. vc1: select interlaced scan table by FCM element Generalize RIFF INFO tag support; support reading INFO tag in wav pthread: track thread existence in a separate variable. Conflicts: doc/filters.texi libavcodec/pthread.c libavformat/avi.c libavformat/riff.c libavformat/riff.h libavformat/wav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo3: error out if no motion vector is set.Aneesh Dogra2011-11-27
| | | | | | | | | | | | This fixes a crash on a corrupt bitstream (bugzilla #93). Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | indeo3: out of array read checks for decode_plane()Michael Niedermayer2011-11-25
| | | | | | | | | | | | Fixes: avi+indeo3+++1-dog.avi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | indeo3: Check remaining bits in parse_bintree()Michael Niedermayer2011-11-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | indeo3: fix null pointer dereference in vulnerable.movMichael Niedermayer2011-11-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: tls: Use ERR_get_error() in do_tls_poll indeo3: Fix a fencepost error. mxfdec: Fix comparison of unsigned expression < 0. mpegts: set stream id on just created stream, not an unrelated variable ra288: return error if input buffer is too small ra288: utilize DSPContext.vector_fmul() ra288: use memcpy() to copy decoded samples to output mace: only calculate output buffer size once Remove redundant filename self-references inside files. indeo3data: add missing config.h #include for HAVE_BIGENDIAN x86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory avplay: reset rdft when closing stream. doc/git-howto: expand format-patch and send-email notes. lavf: expand doxy for some AVFormatContext fields. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo3: Fix a fencepost error.Alex Converse2011-11-08
| | | | | | | | Found with asan and the venerable 1-dog.avi sample.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (44 commits) replacement Indeo 3 decoder gsm demuxer: do not allocate packet twice. flvenc: use first packet delay as global delay. ac3enc: doxygen update. imc: return error codes instead of 0 for error conditions. imc: return meaningful error codes instead of -1 imc: do not set channel layout for stereo imc: validate channel count imc: check for ff_fft_init() failure imc: check output buffer size before decoding imc: use DSPContext.bswap16_buf() to byte-swap packet data rtsp: add allowed_media_types option libgsm: add flush function to reset the decoder state when seeking libgsm: simplify decoding by using a loop gsm: log error message when packet is too small libgsmdec: do not needlessly set *data_size to 0 gsmdec: do not needlessly set *data_size to 0 gsmdec: add flush function to reset the decoder state when seeking libgsmdec: check output buffer size before decoding gsmdec: log error message when output buffer is too small. ... Conflicts: Changelog ffplay.c libavcodec/indeo3.c libavcodec/mjpeg_parser.c libavcodec/vp3.c libavformat/cutils.c libavformat/id3v2.c libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * replacement Indeo 3 decoderMaxim Poliakovski2011-11-03
| | | | | | | | | | | | | | The new decoder is much smaller and has better code quality. Cleanup and fixes courtesy of Kostya Shishkov. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Remove some stray unnecessary ffmpeg references.Diego Biurrun2011-11-02
| |
* | 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.
* | indeo3: add out-of-buffer write checkStefano Sabatini2011-05-25
| | | | | | | | | | Prevent out-of-buffer writes. In particular fix smclocki32.avi.1.1 crash, trac issue #114, roundup issue #1482.
* | indeo3: release buffer in indeo3_decode_end()Stefano Sabatini2011-05-20
| | | | | | | | Fix leak.
* | indeo3: remove unnecessary includesStefano Sabatini2011-05-20
| |
* | indeo3: add @file doxy and a link to multimedia wiki documentationStefano Sabatini2011-05-20
| |
* | 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.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) doc: Check standalone compilation before submitting new components. Fix standalone compilation of pipe protocol. Fix standalone compilation of ac3_fixed encoder. Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders. Fix standalone compilation of IMC decoder. Fix standalone compilation of WTV demuxer. Fix standalone compilation of MXPEG decoder. flashsv: K&R cosmetics matroskaenc: fix memory leak vc1: make overlap filter for I-frames bit-exact. vc1dec: use s->start/end_mb_y instead of passing them as function args. Revert "VC1: merge idct8x8, coeff adjustments and put_pixels." Replace strncpy() with av_strlcpy(). indeo3: Eliminate use of long. get_bits: make cache unsigned to eliminate undefined signed overflow. asfdec: fix assert failure on invalid files avfilter: check malloc return values. Not pulled as reason for reindent is not pulled: mpegvideo: reindent. nutenc: check malloc return values. Not pulled due to much simpler solution in ffmpeg *: don't av_malloc(0). ... Conflicts: doc/developer.texi libavcodec/Makefile libavcodec/get_bits.h libavcodec/mpegvideo.c libavformat/Makefile libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo3: Eliminate use of long.Alex Converse2011-05-03
| |
| * 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>
* | 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)
* 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
* Add av_ prefix to bswap macrosMåns Rullgård2010-07-10
| | | | Originally committed as revision 24170 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
* 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
* Replace WORDS_BIGENDIAN with HAVE_BIGENDIANMåns Rullgård2009-07-26
| | | | Originally committed as revision 19508 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
* Change av_free to av_freepReimar Döffinger2009-07-06
| | | | Originally committed as revision 19360 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reallocate internal buffer when coded frame size changes.Reimar Döffinger2009-07-06
| | | | | | Fixes out-of-bounds reads and writes with i32/smclocki32.avi.1.0 from issue 1240. Originally committed as revision 19359 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change iv_decode_frame to get AVCodecContext as argument, so thatReimar Döffinger2009-07-06
| | | | | | avcodec_check_dimensions can be called with a proper context instead of NULL. Originally committed as revision 19358 to svn://svn.ffmpeg.org/ffmpeg/trunk
* indeo3 decoder uses get_buffer, set CODEC_CAP_DR1Baptiste Coudurier2009-06-05
| | | | Originally committed as revision 19090 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes anThilo Borgmann2009-04-07
| | | | | | | | | | | 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
* Reindent after last commitAlex Converse2009-02-19
| | | | Originally committed as revision 17464 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Some buffer checks for indeo3Alex Converse2009-02-19
| | | | Originally committed as revision 17462 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unneeded check.Benoit Fouet2009-01-26
| | | | Originally committed as revision 16803 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix an exploit in indeo by checking we are not writing out of the strip array.Benoit Fouet2009-01-26
| | | | | | Fixes issue 655 Originally committed as revision 16802 to svn://svn.ffmpeg.org/ffmpeg/trunk
* indeo3: replace sizeof(struct ...) by sizeof(*var)Aurelien Jacobs2008-12-14
| | | | Originally committed as revision 16128 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace 'typedef struct ustr_t' by 'struct ustr', _t is POSIX namespace.Diego Biurrun2008-12-13
| | | | Originally committed as revision 16099 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename some variables and add some comments to try to be a bit more clear.Benoit Fouet2008-10-02
| | | | Originally committed as revision 15510 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 14:23:31 +0000