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
2016-09-23avcodec/cavsdsp: use av_clip_uint8() for idctMichael Niedermayer
Fixes out of array read Fixes: 1.swf Found-by: 连一汉 <lianyihan@360.cn> Tested-by: 连一汉 <lianyihan@360.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2014-07-25Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'Michael Niedermayer
* commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac': qpeldsp: Mark source pointer in qpel_mc_func function pointer const Conflicts: libavcodec/h264qpel_template.c libavcodec/x86/cavsdsp.c libavcodec/x86/rv40dsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-25qpeldsp: Mark source pointer in qpel_mc_func function pointer constDiego Biurrun
2014-07-19Merge commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae'Michael Niedermayer
* commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae': idct: Convert IDCT permutation #defines to an enum Conflicts: libavcodec/idctdsp.c libavcodec/x86/cavsdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-18idct: Convert IDCT permutation #defines to an enumDiego Biurrun
Also rename the enum values to be consistent with other DCT permutations.
2014-07-01Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'Michael Niedermayer
* commit 'e3fcb14347466095839c2a3c47ebecff02da891e': dsputil: Split off IDCT bits into their own context Conflicts: configure libavcodec/aic.c libavcodec/arm/Makefile libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/asvdec.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dvdec.c libavcodec/dxva2_mpeg2.c libavcodec/intrax8.c libavcodec/mdec.c libavcodec/mjpegdec.c libavcodec/mjpegenc_common.h libavcodec/mpegvideo.c libavcodec/ppc/dsputil_altivec.h libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/idctdsp.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30dsputil: Split off IDCT bits into their own contextDiego Biurrun
2014-03-23Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'Michael Niedermayer
* commit 'f9279ee74936b4990fc46287c27816ef828cc06c': dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h Conflicts: libavcodec/imgconvert.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.hDiego Biurrun
2014-03-14Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852'Michael Niedermayer
* commit '05563ccacc98fd185affdbf8cbaf094caf36b852': dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names Conflicts: libavcodec/bit_depth_template.c libavcodec/motionpixels_tablegen.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl namesDiego Biurrun
Also switch from "tbl" to "tab" name suffixes.
2013-05-01Merge commit '088f38a4f9f54bb923405c67c9e72d96d90aa284'Michael Niedermayer
* commit '088f38a4f9f54bb923405c67c9e72d96d90aa284': avcodec: Drop unnecessary ff_ name prefixes from static functions Conflicts: libavcodec/ass.c libavcodec/h264_parser.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30avcodec: Drop unnecessary ff_ name prefixes from static functionsDiego Biurrun
2013-04-08lavc: Make pointers to ff_cropTbl constMartin Storsjö
There's no point in these pointers not being const. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-01cavsdsp: fix "warning: initialization discards const qualifier from pointer ↵Michael Niedermayer
target type" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13Merge commit 'a8b6015823e628047a45916404c00044c5e80415'Michael Niedermayer
* commit 'a8b6015823e628047a45916404c00044c5e80415': dsputil: convert remaining functions to use ptrdiff_t strides Conflicts: libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/h264qpel_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12dsputil: convert remaining functions to use ptrdiff_t stridesLuca Barbato
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-01-23Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f': Drop DCTELEM typedef Conflicts: libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/motion_est_alpha.c libavcodec/arm/dsputil_init_armv6.c libavcodec/bfin/dsputil_bfin.h libavcodec/bfin/pixels_bfin.S libavcodec/cavs.c libavcodec/cavsdec.c libavcodec/dct-test.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/eamad.c libavcodec/h264_cavlc.c libavcodec/h264idct_template.c libavcodec/mpeg12.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/ppc/dsputil_altivec.c libavcodec/proresdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23Drop DCTELEM typedefDiego Biurrun
It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2012-10-08Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86) x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86) x86: call most of the x86 dsp init functions under if (ARCH_X86) doc: support the new website layout doc: remove a warning from filters.texi doc: initial nut documentation segment: drop global headers setting lavu: fix typo in Makefile Conflicts: doc/Makefile doc/filters.texi doc/t2h.init libavcodec/fmtconvert.c libavcodec/proresdsp.c libavcodec/x86/Makefile libavcodec/x86/vc1dsp_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86)Janne Grunau
2012-09-08Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mov_chan: Only set the channel_layout if setting it to a nonzero value mov_chan: Reindent an incorrectly indented line mp2 muxer: mark as AVFMT_NOTIMESTAMPS. x86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64 x86: more specific checks for availability of required assembly capabilities x86: avcodec: Drop silly "_mmx" suffix from dsputil template names fate: Drop redundant setting of FUZZ to 1 cavsdsp: set idct permutation independently of dsputil x86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07cavsdsp: set idct permutation independently of dsputilMans Rullgard
CAVS uses its own idct so using dsputil to set the permutation is fragile. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-08-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-08-15Don't include common.h from avutil.hMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2010-08-26Remove duplicate definitions of fullpel MC functionsMåns Rullgård
This removes duplicated definitions of 8x8 and 16x16 fullpel MC functions with various names reducing dsputil.o by 8k on x86_64. Originally committed as revision 24933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04Move cavs dsp functions to their own structMåns Rullgård
Originally committed as revision 24685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07Move some dsp func prototypes to dsputil.h; they are defined in dsputil.cMåns Rullgård
Originally committed as revision 22264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13More av_cold for infrequently called functions.Zuxy Meng
Originally committed as revision 21179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10avoid duplicating dsputil's clear_blockStefan Gehrer
Originally committed as revision 17135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05license header consistency cosmeticsDiego Biurrun
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-25Add av_ prefix to clip functionsReimar Döffinger
Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-12rename cropTbl -> ff_cropTblMåns Rullgård
Originally committed as revision 6992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun
and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-29some MMX optimizations for the CAVS decoderStefan Gehrer
Originally committed as revision 5846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-05add rounding bias earlier in the idct, avoids many addsMichael Niedermayer
Originally committed as revision 5618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-03CAVS decoder by (Stefan Gehrer stefan.gehrer gmx.de)Michael Niedermayer
Originally committed as revision 5590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-02new files for the CAVS decoder by (Stefan Gehrer <stefan gehrer gmx de)Michael Niedermayer
Originally committed as revision 5567 to svn://svn.ffmpeg.org/ffmpeg/trunk