* 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>
		
			
				
	
	
		
			52 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			52 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * x86 PNG optimizations.
 | |
|  * Copyright (c) 2008 Loren Merrit <lorenm@u.washington.edu>
 | |
|  *
 | |
|  * This file is part of FFmpeg.
 | |
|  *
 | |
|  * FFmpeg is free software; you can redistribute it and/or
 | |
|  * modify it under the terms of the GNU Lesser General Public
 | |
|  * License as published by the Free Software Foundation; either
 | |
|  * version 2.1 of the License, or (at your option) any later version.
 | |
|  *
 | |
|  * FFmpeg is distributed in the hope that it will be useful,
 | |
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
|  * Lesser General Public License for more details.
 | |
|  *
 | |
|  * You should have received a copy of the GNU Lesser General Public
 | |
|  * License along with FFmpeg; if not, write to the Free Software
 | |
|  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 | |
|  */
 | |
| 
 | |
| #include "libavutil/common.h"
 | |
| #include "libavutil/cpu.h"
 | |
| #include "libavcodec/pngdsp.h"
 | |
| 
 | |
| void ff_add_png_paeth_prediction_mmx2 (uint8_t *dst, uint8_t *src,
 | |
|                                        uint8_t *top, int w, int bpp);
 | |
| void ff_add_png_paeth_prediction_ssse3(uint8_t *dst, uint8_t *src,
 | |
|                                        uint8_t *top, int w, int bpp);
 | |
| void ff_add_bytes_l2_mmx (uint8_t *dst, uint8_t *src1,
 | |
|                           uint8_t *src2, int w);
 | |
| void ff_add_bytes_l2_sse2(uint8_t *dst, uint8_t *src1,
 | |
|                           uint8_t *src2, int w);
 | |
| 
 | |
| void ff_pngdsp_init_x86(PNGDSPContext *dsp)
 | |
| {
 | |
| #if HAVE_YASM
 | |
|     int flags = av_get_cpu_flags();
 | |
| 
 | |
| #if ARCH_X86_32
 | |
|     if (flags & AV_CPU_FLAG_MMX)
 | |
|         dsp->add_bytes_l2         = ff_add_bytes_l2_mmx;
 | |
| #endif
 | |
|     if (flags & AV_CPU_FLAG_MMXEXT)
 | |
|         dsp->add_paeth_prediction = ff_add_png_paeth_prediction_mmx2;
 | |
|     if (flags & AV_CPU_FLAG_SSE2)
 | |
|         dsp->add_bytes_l2         = ff_add_bytes_l2_sse2;
 | |
|     if (flags & AV_CPU_FLAG_SSSE3)
 | |
|         dsp->add_paeth_prediction = ff_add_png_paeth_prediction_ssse3;
 | |
| #endif
 | |
| }
 |