ffmpeg | branch: master | James Almer <[email protected]> | Wed Mar 15 21:17:37 2017 -0300| [916dff9cb10220aa88241da33a56ddeb8906826c] | committer: James Almer
Merge commit '230b1c070baa3b6d4bd590426a365b843d60ff50' * commit '230b1c070baa3b6d4bd590426a365b843d60ff50': intreadwrite: Add intermediate variables in the byteswise AV_W*() macros Mostly a noop. Merged for cosmetic purposes. See d83ff76ca0e1ec905ca2d5b27bd0973991eadbd9 Merged-by: James Almer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=916dff9cb10220aa88241da33a56ddeb8906826c --- libavutil/intreadwrite.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h index 51fbe30..89d25ac 100644 --- a/libavutil/intreadwrite.h +++ b/libavutil/intreadwrite.h @@ -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; \ ====================================================================== diff --cc libavutil/intreadwrite.h index 51fbe30,5f65957..89d25ac --- a/libavutil/intreadwrite.h +++ b/libavutil/intreadwrite.h @@@ -242,8 -210,8 +242,8 @@@ union unaligned_16 { uint16_t l; } __at ((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; \ ++ uint16_t d = (val); \ ((uint8_t*)(p))[1] = (d); \ ((uint8_t*)(p))[0] = (d)>>8; \ } while(0) @@@ -255,8 -223,8 +255,8 @@@ ((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; \ ++ uint16_t d = (val); \ ((uint8_t*)(p))[0] = (d); \ ((uint8_t*)(p))[1] = (d)>>8; \ } while(0) @@@ -270,8 -238,8 +270,8 @@@ ((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; \ ++ uint32_t d = (val); \ ((uint8_t*)(p))[3] = (d); \ ((uint8_t*)(p))[2] = (d)>>8; \ ((uint8_t*)(p))[1] = (d)>>16; \ @@@ -287,8 -255,8 +287,8 @@@ ((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; \ ++ uint32_t d = (val); \ ((uint8_t*)(p))[0] = (d); \ ((uint8_t*)(p))[1] = (d)>>8; \ ((uint8_t*)(p))[2] = (d)>>16; \ @@@ -308,8 -276,8 +308,8 @@@ (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; \ ++ uint64_t d = (val); \ ((uint8_t*)(p))[7] = (d); \ ((uint8_t*)(p))[6] = (d)>>8; \ ((uint8_t*)(p))[5] = (d)>>16; \ @@@ -333,8 -301,8 +333,8 @@@ (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; \ ++ uint64_t d = (val); \ ((uint8_t*)(p))[0] = (d); \ ((uint8_t*)(p))[1] = (d)>>8; \ ((uint8_t*)(p))[2] = (d)>>16; \ _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
