summaryrefslogtreecommitdiff
path: root/libavresample/x86/dither_init.c
Commit message (Collapse)AuthorAge
* Merge commit 'd68c05380cebf563915412182643a8be04ef890b'Michael Niedermayer2015-06-01
|\ | | | | | | | | | | | | | | * commit 'd68c05380cebf563915412182643a8be04ef890b': x86: check for AV_CPU_FLAG_AVXSLOW where useful See: c16e99e3b3c02edcf33245468731d414eab97dac Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: check for AV_CPU_FLAG_AVXSLOW where usefulJames Almer2015-05-31
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Consistently use "cpu_flags" as variable/parameter name for CPU flags Conflicts: libavcodec/x86/dsputil_init.c libavcodec/x86/h264dsp_init.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/motion_est.c libavcodec/x86/mpegvideo.c libavcodec/x86/proresdsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Consistently use "cpu_flags" as variable/parameter name for CPU flagsDiego Biurrun2013-07-18
| |
* | Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'Michael Niedermayer2013-03-28
|\| | | | | | | | | | | | | | | | | | | * commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa': cosmetics: Remove unnecessary extern keywords from function declarations Conflicts: libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Remove unnecessary extern keywords from function declarationsDiego Biurrun2013-03-27
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: xan: Convert to bytestream2 oggenc: add a page_duration option and deprecate the pagesize option x86: lavr: add SSE2/AVX dither_int_to_float() Conflicts: libavcodec/xan.c libavformat/oggenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: lavr: add SSE2/AVX dither_int_to_float()Justin Ruggles2013-01-08
| |
* | Merge commit '1fb8f6a44f06e48386450fe0363aefc02583d24a'Michael Niedermayer2013-01-09
|/ | | | | | | | | | | | * commit '1fb8f6a44f06e48386450fe0363aefc02583d24a': x86: lavr: add SSE2 quantize() for dithering doc/APIchanges: fill in missing dates and hashes. rtpdec_vp8: Request a keyframe if RTP packets are lost Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
* x86: lavr: add SSE2 quantize() for ditheringJustin Ruggles2013-01-08