* commit '7384b7a71338d960e421d6dc3d77da09b0a442cb': arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp Conflicts: libavcodec/arm/Makefile libavcodec/arm/hpeldsp_arm.S libavcodec/arm/hpeldsp_arm.h libavcodec/arm/hpeldsp_armv6.S libavcodec/arm/hpeldsp_init_arm.c libavcodec/arm/hpeldsp_init_armv6.c libavcodec/arm/hpeldsp_init_neon.c libavcodec/arm/hpeldsp_neon.S libavcodec/hpeldsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			30 lines
		
	
	
		
			1.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			30 lines
		
	
	
		
			1.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (c) 2009 Mans Rullgard <mans@mansr.com>
 | 
						|
 *
 | 
						|
 * 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
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef AVCODEC_ARM_HPELDSP_H
 | 
						|
#define AVCODEC_ARM_HPELDSP_H
 | 
						|
 | 
						|
#include "libavcodec/hpeldsp.h"
 | 
						|
 | 
						|
void ff_hpeldsp_init_armv6(HpelDSPContext *c, int flags);
 | 
						|
void ff_hpeldsp_init_neon(HpelDSPContext *c, int flags);
 | 
						|
 | 
						|
#endif /* AVCODEC_ARM_HPELDSP_H */
 |