mirror of
				https://github.com/nyanmisaka/ffmpeg-rockchip.git
				synced 2025-11-01 04:53:04 +08:00 
			
		
		
		
	Merge commit '230b1c070baa3b6d4bd590426a365b843d60ff50'
* commit '230b1c070baa3b6d4bd590426a365b843d60ff50':
  intreadwrite: Add intermediate variables in the byteswise AV_W*() macros
Mostly a noop. Merged for cosmetic purposes.
See d83ff76ca0
Merged-by: James Almer <jamrial@gmail.com>
			
			
This commit is contained in:
		| @@ -242,8 +242,8 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; | ||||
|       ((const uint8_t*)(x))[1]) | ||||
| #endif | ||||
| #ifndef AV_WB16 | ||||
| #   define AV_WB16(p, darg) do {                \ | ||||
|         unsigned d = (darg);                    \ | ||||
| #   define AV_WB16(p, val) do {                 \ | ||||
|         uint16_t d = (val);                     \ | ||||
|         ((uint8_t*)(p))[1] = (d);               \ | ||||
|         ((uint8_t*)(p))[0] = (d)>>8;            \ | ||||
|     } while(0) | ||||
| @@ -255,8 +255,8 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; | ||||
|       ((const uint8_t*)(x))[0]) | ||||
| #endif | ||||
| #ifndef AV_WL16 | ||||
| #   define AV_WL16(p, darg) do {                \ | ||||
|         unsigned d = (darg);                    \ | ||||
| #   define AV_WL16(p, val) do {                 \ | ||||
|         uint16_t d = (val);                     \ | ||||
|         ((uint8_t*)(p))[0] = (d);               \ | ||||
|         ((uint8_t*)(p))[1] = (d)>>8;            \ | ||||
|     } while(0) | ||||
| @@ -270,8 +270,8 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; | ||||
|                 ((const uint8_t*)(x))[3]) | ||||
| #endif | ||||
| #ifndef AV_WB32 | ||||
| #   define AV_WB32(p, darg) do {                \ | ||||
|         unsigned d = (darg);                    \ | ||||
| #   define AV_WB32(p, val) do {                 \ | ||||
|         uint32_t d = (val);                     \ | ||||
|         ((uint8_t*)(p))[3] = (d);               \ | ||||
|         ((uint8_t*)(p))[2] = (d)>>8;            \ | ||||
|         ((uint8_t*)(p))[1] = (d)>>16;           \ | ||||
| @@ -287,8 +287,8 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; | ||||
|                 ((const uint8_t*)(x))[0]) | ||||
| #endif | ||||
| #ifndef AV_WL32 | ||||
| #   define AV_WL32(p, darg) do {                \ | ||||
|         unsigned d = (darg);                    \ | ||||
| #   define AV_WL32(p, val) do {                 \ | ||||
|         uint32_t d = (val);                     \ | ||||
|         ((uint8_t*)(p))[0] = (d);               \ | ||||
|         ((uint8_t*)(p))[1] = (d)>>8;            \ | ||||
|         ((uint8_t*)(p))[2] = (d)>>16;           \ | ||||
| @@ -308,8 +308,8 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; | ||||
|       (uint64_t)((const uint8_t*)(x))[7]) | ||||
| #endif | ||||
| #ifndef AV_WB64 | ||||
| #   define AV_WB64(p, darg) do {                \ | ||||
|         uint64_t d = (darg);                    \ | ||||
| #   define AV_WB64(p, val) do {                 \ | ||||
|         uint64_t d = (val);                     \ | ||||
|         ((uint8_t*)(p))[7] = (d);               \ | ||||
|         ((uint8_t*)(p))[6] = (d)>>8;            \ | ||||
|         ((uint8_t*)(p))[5] = (d)>>16;           \ | ||||
| @@ -333,8 +333,8 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; | ||||
|       (uint64_t)((const uint8_t*)(x))[0]) | ||||
| #endif | ||||
| #ifndef AV_WL64 | ||||
| #   define AV_WL64(p, darg) do {                \ | ||||
|         uint64_t d = (darg);                    \ | ||||
| #   define AV_WL64(p, val) do {                 \ | ||||
|         uint64_t d = (val);                     \ | ||||
|         ((uint8_t*)(p))[0] = (d);               \ | ||||
|         ((uint8_t*)(p))[1] = (d)>>8;            \ | ||||
|         ((uint8_t*)(p))[2] = (d)>>16;           \ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 James Almer
					James Almer