mirror of
				https://github.com/nyanmisaka/ffmpeg-rockchip.git
				synced 2025-10-31 20:42:49 +08:00 
			
		
		
		
	Simplify init preprocessor statements.
patch by Albert Lee, trisk+xine acm.jhu edu Originally committed as revision 9307 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		 Albert Lee
					Albert Lee
				
			
				
					committed by
					
						 Diego Biurrun
						Diego Biurrun
					
				
			
			
				
	
			
			
			 Diego Biurrun
						Diego Biurrun
					
				
			
						parent
						
							4931546e26
						
					
				
				
					commit
					ad0f6c1fcd
				
			| @@ -4138,31 +4138,23 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx) | |||||||
|     memset(c->put_2tap_qpel_pixels_tab, 0, sizeof(c->put_2tap_qpel_pixels_tab)); |     memset(c->put_2tap_qpel_pixels_tab, 0, sizeof(c->put_2tap_qpel_pixels_tab)); | ||||||
|     memset(c->avg_2tap_qpel_pixels_tab, 0, sizeof(c->avg_2tap_qpel_pixels_tab)); |     memset(c->avg_2tap_qpel_pixels_tab, 0, sizeof(c->avg_2tap_qpel_pixels_tab)); | ||||||
|  |  | ||||||
| #ifdef HAVE_MMX | #if defined(HAVE_MMX) | ||||||
|     dsputil_init_mmx(c, avctx); |     dsputil_init_mmx(c, avctx); | ||||||
| #endif | #elif defined(ARCH_ARMV4L) | ||||||
| #ifdef ARCH_ARMV4L |  | ||||||
|     dsputil_init_armv4l(c, avctx); |     dsputil_init_armv4l(c, avctx); | ||||||
| #endif | #elif defined(HAVE_MLIB) | ||||||
| #ifdef HAVE_MLIB |  | ||||||
|     dsputil_init_mlib(c, avctx); |     dsputil_init_mlib(c, avctx); | ||||||
| #endif | #elif defined(ARCH_SPARC) | ||||||
| #ifdef ARCH_SPARC |  | ||||||
|    dsputil_init_vis(c,avctx); |    dsputil_init_vis(c,avctx); | ||||||
| #endif | #elif defined(ARCH_ALPHA) | ||||||
| #ifdef ARCH_ALPHA |  | ||||||
|     dsputil_init_alpha(c, avctx); |     dsputil_init_alpha(c, avctx); | ||||||
| #endif | #elif defined(ARCH_POWERPC) | ||||||
| #ifdef ARCH_POWERPC |  | ||||||
|     dsputil_init_ppc(c, avctx); |     dsputil_init_ppc(c, avctx); | ||||||
| #endif | #elif defined(HAVE_MMI) | ||||||
| #ifdef HAVE_MMI |  | ||||||
|     dsputil_init_mmi(c, avctx); |     dsputil_init_mmi(c, avctx); | ||||||
| #endif | #elif defined(ARCH_SH4) | ||||||
| #ifdef ARCH_SH4 |  | ||||||
|     dsputil_init_sh4(c,avctx); |     dsputil_init_sh4(c,avctx); | ||||||
| #endif | #elif defined(ARCH_BFIN) | ||||||
| #ifdef ARCH_BFIN |  | ||||||
|     dsputil_init_bfin(c,avctx); |     dsputil_init_bfin(c,avctx); | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|   | |||||||
| @@ -277,25 +277,19 @@ int DCT_common_init(MpegEncContext *s) | |||||||
|     s->denoise_dct= denoise_dct_c; |     s->denoise_dct= denoise_dct_c; | ||||||
| #endif //CONFIG_ENCODERS | #endif //CONFIG_ENCODERS | ||||||
|  |  | ||||||
| #ifdef HAVE_MMX | #if defined(HAVE_MMX) | ||||||
|     MPV_common_init_mmx(s); |     MPV_common_init_mmx(s); | ||||||
| #endif | #elif defined(ARCH_ALPHA) | ||||||
| #ifdef ARCH_ALPHA |  | ||||||
|     MPV_common_init_axp(s); |     MPV_common_init_axp(s); | ||||||
| #endif | #elif defined(HAVE_MLIB) | ||||||
| #ifdef HAVE_MLIB |  | ||||||
|     MPV_common_init_mlib(s); |     MPV_common_init_mlib(s); | ||||||
| #endif | #elif defined(HAVE_MMI) | ||||||
| #ifdef HAVE_MMI |  | ||||||
|     MPV_common_init_mmi(s); |     MPV_common_init_mmi(s); | ||||||
| #endif | #elif defined(ARCH_ARMV4L) | ||||||
| #ifdef ARCH_ARMV4L |  | ||||||
|     MPV_common_init_armv4l(s); |     MPV_common_init_armv4l(s); | ||||||
| #endif | #elif defined(ARCH_POWERPC) | ||||||
| #ifdef ARCH_POWERPC |  | ||||||
|     MPV_common_init_ppc(s); |     MPV_common_init_ppc(s); | ||||||
| #endif | #elif defined(ARCH_BFIN) | ||||||
| #ifdef ARCH_BFIN |  | ||||||
|     MPV_common_init_bfin(s); |     MPV_common_init_bfin(s); | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user