ffmpeg

Commit Graph

Author	SHA1	Message	Date
Michael Niedermayer	9d01bf7d66	Merge remote-tracking branch 'qatar/master' * 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>	2013-07-18 09:53:47 +02:00
Diego Biurrun	3ac7fa81b2	Consistently use "cpu_flags" as variable/parameter name for CPU flags	2013-07-18 00:31:35 +02:00
Michael Niedermayer	63a97d5674	Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' * commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa': cosmetics: Remove unnecessary extern keywords from function declarations Conflicts: libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-03-28 11:20:41 +01:00
Diego Biurrun	b6649ab503	cosmetics: Remove unnecessary extern keywords from function declarations	2013-03-27 14:21:45 +01:00
Michael Niedermayer	4765f63538	Merge remote-tracking branch 'qatar/master' * 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>	2013-01-09 12:30:14 +01:00
Michael Niedermayer	75afbe2ab4	Merge commit '1fb8f6a44f06e48386450fe0363aefc02583d24a' * 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>	2013-01-09 12:14:56 +01:00
Justin Ruggles	1fb8f6a44f	x86: lavr: add SSE2 quantize() for dithering	2013-01-08 14:52:43 -05:00
Justin Ruggles	a6a3164b13	x86: lavr: add SSE2/AVX dither_int_to_float()	2013-01-08 14:52:43 -05:00

8 Commits