* commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d': dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc Conflicts: libavcodec/dsputil.c libavcodec/mpegvideo_enc.c libavcodec/x86/dsputilenc.asm libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			39 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			39 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * 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 <stdint.h>
 | 
						|
 | 
						|
#include "libavutil/cpu.h"
 | 
						|
#include "libavutil/arm/cpu.h"
 | 
						|
#include "libavcodec/avcodec.h"
 | 
						|
#include "libavcodec/mpegvideoencdsp.h"
 | 
						|
 | 
						|
int ff_pix_norm1_armv6(uint8_t *pix, int line_size);
 | 
						|
int ff_pix_sum_armv6(uint8_t *pix, int line_size);
 | 
						|
 | 
						|
av_cold void ff_mpegvideoencdsp_init_arm(MpegvideoEncDSPContext *c,
 | 
						|
                                         AVCodecContext *avctx)
 | 
						|
{
 | 
						|
    int cpu_flags = av_get_cpu_flags();
 | 
						|
 | 
						|
    if (have_armv6(cpu_flags)) {
 | 
						|
        c->pix_norm1 = ff_pix_norm1_armv6;
 | 
						|
        c->pix_sum   = ff_pix_sum_armv6;
 | 
						|
    }
 | 
						|
}
 |