summaryrefslogtreecommitdiff
path: root/libavcodec/fraps.c
Commit message (Collapse)AuthorAgeFilesLines
* Replace a av_fast_malloc with av_fast_padded_malloc.Reimar Döffinger2012-01-181-1/+1
| | | | | | | | This one was missed in the previous fraps fix, the allocation is exactly the same in both cases. Fixes fraps-v5 under valgrind. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* Use av_fast_padded_malloc in fraps and mpc decoders.Reimar Döffinger2012-01-181-1/+1
| | | | | | | Fixes FATE failures due to uninitialized reads under valgrind for these two codecs. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-271-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (42 commits) swscale: fix signed overflow in yuv2mono_X_c_template snow: fix integer overflows svq1enc: remove stale altivec-related hack snow: fix signed overflow in byte to 32-bit replication adx: rename ff_adx_decode_header() to avpriv_adx_decode_header() avformat: add CRI ADX format demuxer adx: add an ADX parser. adx: move header decoding to ADX common code adx: calculate the number of blocks in a packet adx: define and use 2 new macro constants BLOCK_SIZE and BLOCK_SAMPLES adx: check for unsupported ADX formats adx: simplify encoding by using put_sbits() adx: calculate correct LPC coeffs adx: use 12-bit coefficients instead of 14-bit to avoid integer overflow adx: simplify adx_decode() by using get_sbits() to read residual samples adx: fix the data offset parsing in adx_decode_header() adx: remove unneeded post-decode channel interleaving adx: validate header values adx: cosmetics: general pretty-printing and comment clean-up adx: remove useless comments ... Conflicts: Changelog libavcodec/cook.c libavcodec/fraps.c libavcodec/nuv.c libavcodec/pthread.c libavcodec/version.h libavformat/Makefile libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fraps: check for overread.Michael Niedermayer2011-11-261-0/+4
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | fraps: check overread per sample instead of per lineMichael Niedermayer2011-11-091-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fraps: fix memleakMichael Niedermayer2011-11-091-1/+3
| | | | | | | | | | Found-by reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fraps: check for overreadMichael Niedermayer2011-11-091-0/+2
| | | | | | | | | | | | Fixeds Ticket619 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Try to set AVFrame.reference to correct values.Reimar Döffinger2011-11-051-4/+4
| | | | | | | | | | | | | | | | | | 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-9/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-9/+8
| | | | | | | | It's more readable and less prone to breakage.
| * Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini2011-05-021-10/+10
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | lavc: set defaults in internal codec framesStefano Sabatini2011-05-071-0/+1
| | | | | | | | | | | | | | | | | | 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.
* | replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini2011-05-021-10/+10
| |
* | fraps: do not set avctx->pix_fmt to none in decode_init()Stefano Sabatini2011-04-251-1/+0
| | | | | | | | | | | | | | | | | | | | This is required for setting up the filterchain, as it requires the pixel format to be set, which is usually done when probing the file with av_find_stream_info(). Fix trac issue #83. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | Check for malloc failures in fraps decoder.Reimar Döffinger2011-04-241-0/+4
| |
* | Use av_fast_malloc instead of av_realloc in fraps decoder.Reimar Döffinger2011-04-241-2/+3
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-131-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Partially merged:flvdec: Allow parsing keyframes metadata without seeking in most cases Error out if vaapi is not found avio: undeprecate av_url_read_fseek/fpause under nicer names libvo-*: Don't use deprecated sample format names and enum names DUPLICATE flvdec: Fix support for flvtool2 "keyframes based" generated index DUPLICATE libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32. Convert some undefined 1<<31 shifts into 1U<<31. Conflicts: configure libavcodec/libvo-aacenc.c libavcodec/libvo-amrwbenc.c libavformat/flvdec.c Marged-by: Michael Niedermayer <michaelni@gmx.at>
| * Convert some undefined 1<<31 shifts into 1U<<31.Alex Converse2011-04-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | According to ISO 9899:1999 S 6.5.7/4: The result of E1 << E2 is E1 left-shifted E2 bit positions; vacated bits are filled with zeros. If E1 has an unsigned type, the value of the result is E1× 2^E2, reduced modulo one more than the maximum value representable in the result type. If E1 has a signed type and nonnegative value, and E1× 2^E2 is representable in the result type, then that is the resulting value; otherwise, the behavior is undefined.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-261-1/+1
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-281-1/+1
|/ | | | | | | | 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 FRAPS decoder use PC range instead of TV rangeJason Garrett-Glaser2010-10-021-2/+2
| | | | | | | FRAPS appears to output PC range streams. I can't guarantee this is true of all versions. Originally committed as revision 25308 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove incomplete Doxygen for static decode_frame functions.Thilo Borgmann2010-07-141-9/+0
| | | | | | | | These functions are not documented for other decoders and should be obvious enough even without Doxygen. patch by Thilo Borgmann, thilo.borgmann googlemail com Originally committed as revision 24237 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add back previously removed non-existing function params in doxygen comments.Diego Biurrun2010-07-081-0/+2
| | | | Originally committed as revision 24131 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove angular brackets from Doxygen comments; Doxygen confuses them for HTML.Diego Biurrun2010-07-021-1/+1
| | | | Originally committed as revision 23991 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove non-existing stray arguments from Doxygen function documentation.Diego Biurrun2010-07-021-2/+0
| | | | Originally committed as revision 23976 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | 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-301-1/+1
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove useless assignment during initialization for some decodersKostya Shishkov2009-04-241-1/+0
| | | | Originally committed as revision 18680 to svn://svn.ffmpeg.org/ffmpeg/trunk
* For every line, copy 3*width bytes instead of linesize[0] to avoidVitor Sessak2009-04-141-1/+1
| | | | | | | | problems with padding. Fix issue 959 Originally committed as revision 18512 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename bitstream.h to get_bits.h.Stefano Sabatini2009-04-131-1/+1
| | | | Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes anThilo Borgmann2009-04-071-1/+3
| | | | | | | | | | | 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
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-011-1/+1
| | | | | | | Otherwise doxygen complains about ambiguous filenames when files exist under the same name in different subdirectories. Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fraps version 3 seems to be the same as Fraps v5Kostya Shishkov2008-12-041-2/+3
| | | | Originally committed as revision 16002 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify colour conversion in Fraps as suggested by MichaelKostya Shishkov2008-08-111-10/+2
| | | | Originally committed as revision 14690 to svn://svn.ffmpeg.org/ffmpeg/trunk
* R and B components are stored as a differences to G component in Fraps v5.Kostya Shishkov2008-08-101-2/+17
| | | | | | This fixes roundup issue 574. Originally committed as revision 14684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make AVCodec long_names definition conditional depending on CONFIG_SMALL.Stefano Sabatini2008-06-121-1/+1
| | | | Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add long names to many AVCodec declarations.Stefano Sabatini2008-04-271-0/+1
| | | | | | patch by Stefano Sabatini, stefano.sabatini-lala poste it Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Apply 'cold' attribute to init/uninit functions in libavcodecZuxy Meng2008-03-211-2/+2
| | | | Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fraps v5 decoding supportKostya Shishkov2008-03-091-1/+42
| | | | Originally committed as revision 12393 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add step variable (for future v5 decoding)Kostya Shishkov2008-03-091-3/+4
| | | | Originally committed as revision 12392 to svn://svn.ffmpeg.org/ffmpeg/trunk
* huffman: add a zero_count flag and use it in frapsAurelien Jacobs2008-03-081-1/+2
| | | | | | fixes issue349 Originally committed as revision 12374 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add casts to avoid warnings:Reimar Döffinger2008-02-191-1/+1
| | | | | | | fraps.c:102: warning: passing argument 1 of ‘s->dsp.bswap_buf’ from incompatible pointer type fraps.c:102: warning: passing argument 2 of ‘s->dsp.bswap_buf’ from incompatible pointer type Originally committed as revision 12148 to svn://svn.ffmpeg.org/ffmpeg/trunk
* constMichael Niedermayer2008-02-011-4/+4
| | | | Originally committed as revision 11764 to svn://svn.ffmpeg.org/ffmpeg/trunk
* moves fraps huffman decoder to its own file, making it more genericAurelien Jacobs2007-10-141-80/+8
| | | | Originally committed as revision 10736 to svn://svn.ffmpeg.org/ffmpeg/trunk
* license header consistency cosmeticsDiego Biurrun2007-07-051-1/+0
| | | | Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
* correct type of qsort() comparison callbackMåns Rullgård2007-06-161-1/+2
| | | | Originally committed as revision 9338 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove superfluous setting of has_b_frames in codecs without B-frames.Nicholas Tung2007-04-071-1/+0
| | | | | | patch by Nicholas Tung, ntung ntung com Originally committed as revision 8647 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rename BE/LE_8/16/32 to AV_RL/B_8/16/32Alex Beregszaszi2007-01-191-4/+4
| | | | Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check for symbol countKostya Shishkov2006-11-061-0/+4
| | | | Originally committed as revision 6910 to svn://svn.ffmpeg.org/ffmpeg/trunk