Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-02fraps: fix version 0/1 input data size check.Michael Niedermayer
Fixes array overread. Fixes Ticket1371 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-08Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-04-06cosmetics: Align codec declarationsMartin Storsjö
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>
2012-03-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-03-02Remove unnecessary AVFrame pointer casts.Diego Biurrun
2012-02-26Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (34 commits) mlp_parser: fix the channel mask value used for the top surround channel vorbisenc: check all allocations for failure roqaudioenc: return AVERROR codes instead of -1 roqaudioenc: set correct bit rate roqaudioenc: use AVCodecContext.frame_size correctly. roqaudioenc: remove unneeded sample_fmt check ra144enc: use int16_t* for input samples rather than void* ra144enc: set AVCodecContext.coded_frame ra144enc: remove unneeded sample_fmt check nellymoserenc: set AVCodecContext.coded_frame nellymoserenc: improve error checking in encode_init() nellymoserenc: return AVERROR codes instead of -1 libvorbis: improve error checking in oggvorbis_encode_init() mpegaudioenc: return AVERROR codes instead of -1 libfaac: improve error checking and handling in Faac_encode_init() avutil: add AVERROR_UNKNOWN check for coded_frame allocation failure in several audio encoders audio encoders: do not set coded_frame->key_frame. g722enc: check for trellis data allocation error libspeexenc: export encoder delay through AVCodecContext.delay ... Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/fraps.c libavcodec/kgv1dec.c libavcodec/libfaac.c libavcodec/libgsm.c libavcodec/libvorbis.c libavcodec/mlp_parser.c libavcodec/roqaudioenc.c libavcodec/vorbisenc.c libavutil/avutil.h libavutil/error.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-25fraps: release reference buffer on pix_fmt change.Ronald S. Bultje
Prevents crash when trying to copy from a non-existing plane in e.g. a RGB32 reference image to a YUV420P target image Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2012-02-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (27 commits) ppc: Add ff_ prefix to nonstatic symbols sh4: Add ff_ prefix to nonstatic symbols mpegvideo: Add ff_ prefix to nonstatic functions rtjpeg: Add ff_ prefix to nonstatic symbols rv: Add ff_ prefix to nonstatic symbols vp56: Add ff_ prefix to nonstatic symbols vorbis: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefix to nonstatic symbols vc1: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefixes to nonstatic symbols snow: Add ff_ prefix to nonstatic symbols mpeg12: Add ff_ prefix to nonstatic symbols mpeg4: Add ff_ prefixes to nonstatic symbols lagarith: Add ff_ prefix to lag_rac_init libavcodec: Add ff_ prefix to j_rev_dct* dsputil: Add ff_ prefix to inv_zigzag_direct16 libavcodec: Prefix fdct_ifast, fdct_ifast248 dsputil: Add ff_ prefix to the dsputil*_init* functions libavcodec: Add ff_ prefix to some nonstatic symbols vlc/rl: Add ff_ prefix to the nonstatic symbols ... Conflicts: libavcodec/Makefile libavcodec/allcodecs.c libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h263.h libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/nuv.c libavcodec/ppc/dsputil_ppc.c libavcodec/proresdsp.c libavcodec/svq3.c libavcodec/version.h libavformat/dv.h libavformat/dvenc.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-16dsputil: Add ff_ prefix to the dsputil*_init* functionsMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-02-16vlc/rl: Add ff_ prefix to the nonstatic symbolsMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-02-01fraps: Use av_fast_padded_malloc() instead of av_realloc()Reimar Döffinger
Ensures alignment and avoids using uninitialized data. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2012-01-30Fix offset validity checks.Reimar Döffinger
Offsets are relative to the end of the header, not the start of the buffer, thus the buffer size needs to be subtracted. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-01-30fraps: frame threading support.Reimar Döffinger
Codec is too simple to gain much from it at lower resolutions, but should help at very high resolutions, particularly for v3 and v5 where a not too optimized pseudo-YUV to RGB is done in the codec. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-01-30fraps: Deduplicate some code.Reimar Döffinger
Also moves it before the get_buffer call so that most error exits happen before it. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-01-30fraps: Minor simplification, use local variable.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-01-29fraps: optimize pseudo-YUV to RGB conversion.Reimar Döffinger
With gcc 4.6 this part of the code is ca. 4x faster, resulting in an overall speedup of around 5% for fate-fraps-v5 sample. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-01-29fraps: Add release_buffer forgotten when reget_buffer was removed.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-01-29fraps: fix indentation.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-01-29FRAPS: Do not needlessly use reget_buffer.Reimar Döffinger
Codec has only I- and skip-frames, so there is no need for reget_buffer, change it so it works with get_buffer. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-01-22Extract some duplicated code.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-01-22Remove pointless and distracting ()Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-01-22Simplify: just add header_size directly.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-01-22Move some duplicated code, simplify.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-01-22Make variable that always has the same value const.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-01-19Replace a av_fast_malloc with av_fast_padded_malloc.Reimar Döffinger
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>
2012-01-19Use av_fast_padded_malloc in fraps and mpc decoders.Reimar Döffinger
Fixes FATE failures due to uninitialized reads under valgrind for these two codecs. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-27Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2011-11-26fraps: check for overread.Michael Niedermayer
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-09fraps: check overread per sample instead of per lineMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-09fraps: fix memleakMichael Niedermayer
Found-by reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-09fraps: check for overreadMichael Niedermayer
Fixeds Ticket619 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-06Try to set AVFrame.reference to correct values.Reimar Döffinger
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>
2011-07-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2011-07-29lavc: use designated initialisers for all codecs.Anton Khirnov
It's more readable and less prone to breakage.
2011-05-07lavc: set defaults in internal codec framesStefano Sabatini
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.
2011-05-02replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini
2011-05-02Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-04-26fraps: do not set avctx->pix_fmt to none in decode_init()Stefano Sabatini
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>
2011-04-24Check for malloc failures in fraps decoder.Reimar Döffinger
2011-04-24Use av_fast_malloc instead of av_realloc in fraps decoder.Reimar Döffinger
2011-04-13Merge remote branch 'qatar/master'Michael Niedermayer
* 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>
2011-04-12Convert some undefined 1<<31 shifts into 1U<<31.Alex Converse
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.
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-28Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò
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)
2011-01-26Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò
None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
2010-10-02Make FRAPS decoder use PC range instead of TV rangeJason Garrett-Glaser
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
2010-07-14Remove incomplete Doxygen for static decode_frame functions.Thilo Borgmann
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
2010-07-09Add back previously removed non-existing function params in doxygen comments.Diego Biurrun
Originally committed as revision 24131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02Remove angular brackets from Doxygen comments; Doxygen confuses them for HTML.Diego Biurrun
Originally committed as revision 23991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02Remove non-existing stray arguments from Doxygen function documentation.Diego Biurrun
Originally committed as revision 23976 to svn://svn.ffmpeg.org/ffmpeg/trunk