Merge commit '7abdd026df6a9a52d07d8174505b33cc89db7bf6'
* commit '7abdd026df6a9a52d07d8174505b33cc89db7bf6': asm: Consistently uppercase SECTION markers Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
		
						commit
						0c005fa86f
					
				| @ -29,7 +29,7 @@ cextern pw_2 | |||||||
| cextern pw_8 | cextern pw_8 | ||||||
| cextern pw_16 | cextern pw_16 | ||||||
| 
 | 
 | ||||||
| section .text | SECTION .text | ||||||
| 
 | 
 | ||||||
| ; %1 -= (%2 + %3 + 2)>>2     %4 is pw_2 | ; %1 -= (%2 + %3 + 2)>>2     %4 is pw_2 | ||||||
| %macro COMPOSE_53iL0 4 | %macro COMPOSE_53iL0 4 | ||||||
|  | |||||||
| @ -30,7 +30,7 @@ cextern pw_16 | |||||||
| cextern pw_32 | cextern pw_32 | ||||||
| cextern pb_80 | cextern pb_80 | ||||||
| 
 | 
 | ||||||
| section .text | SECTION .text | ||||||
| 
 | 
 | ||||||
| %macro UNPACK_ADD 6 | %macro UNPACK_ADD 6 | ||||||
|     mov%5   %1, %3 |     mov%5   %1, %3 | ||||||
|  | |||||||
| @ -22,7 +22,7 @@ | |||||||
| 
 | 
 | ||||||
| %include "libavutil/x86/x86util.asm" | %include "libavutil/x86/x86util.asm" | ||||||
| 
 | 
 | ||||||
| section .text | SECTION .text | ||||||
| 
 | 
 | ||||||
| ; void get_pixels_8x4_sym_sse2(int16_t *block, const uint8_t *pixels, | ; void get_pixels_8x4_sym_sse2(int16_t *block, const uint8_t *pixels, | ||||||
| ;                              ptrdiff_t line_size) | ;                              ptrdiff_t line_size) | ||||||
|  | |||||||
| @ -25,7 +25,7 @@ | |||||||
| 
 | 
 | ||||||
| %include "libavutil/x86/x86util.asm" | %include "libavutil/x86/x86util.asm" | ||||||
| 
 | 
 | ||||||
| section .text | SECTION .text | ||||||
| 
 | 
 | ||||||
| ; void ff_diff_int16(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, | ; void ff_diff_int16(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, | ||||||
| ;                    unsigned mask, int w); | ;                    unsigned mask, int w); | ||||||
|  | |||||||
| @ -25,7 +25,7 @@ | |||||||
| 
 | 
 | ||||||
| %include "libavutil/x86/x86util.asm" | %include "libavutil/x86/x86util.asm" | ||||||
| 
 | 
 | ||||||
| section .text | SECTION .text | ||||||
| 
 | 
 | ||||||
| ; void ff_diff_bytes(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, | ; void ff_diff_bytes(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, | ||||||
| ;                    intptr_t w); | ;                    intptr_t w); | ||||||
|  | |||||||
| @ -24,7 +24,7 @@ | |||||||
| cextern pw_4 | cextern pw_4 | ||||||
| cextern pw_5 | cextern pw_5 | ||||||
| 
 | 
 | ||||||
| section .text | SECTION .text | ||||||
| 
 | 
 | ||||||
| ; dst_low, dst_high (src), zero | ; dst_low, dst_high (src), zero | ||||||
| ; zero-extends one vector from 8 to 16 bits | ; zero-extends one vector from 8 to 16 bits | ||||||
|  | |||||||
| @ -24,7 +24,7 @@ | |||||||
| cextern pw_9 | cextern pw_9 | ||||||
| cextern pw_128 | cextern pw_128 | ||||||
| 
 | 
 | ||||||
| section .text | SECTION .text | ||||||
| 
 | 
 | ||||||
| %if HAVE_MMX_INLINE | %if HAVE_MMX_INLINE | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -87,9 +87,9 @@ | |||||||
| ; keep supporting OS/2. | ; keep supporting OS/2. | ||||||
| %macro SECTION_RODATA 0-1 16 | %macro SECTION_RODATA 0-1 16 | ||||||
|     %ifidn __OUTPUT_FORMAT__,aout |     %ifidn __OUTPUT_FORMAT__,aout | ||||||
|         section .text |         SECTION .text | ||||||
|     %elifidn __OUTPUT_FORMAT__,coff |     %elifidn __OUTPUT_FORMAT__,coff | ||||||
|         section .text |         SECTION .text | ||||||
|     %else |     %else | ||||||
|         SECTION .rodata align=%1 |         SECTION .rodata align=%1 | ||||||
|     %endif |     %endif | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user