Commit 014773b6 authored by Martin Storsjö's avatar Martin Storsjö

libavutil: Use an intermediate variable in AV_COPY*U

If AV_RN and AV_WN are macros with multiple individual reads and
writes, the previous version of the AV_COPYU macro would fail if
the reads and writes overlap.

This should not be any less efficient in any case, given a
sensibly optimizing compiler.
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent 25bacd0a
...@@ -467,7 +467,11 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; ...@@ -467,7 +467,11 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
* memory locations. * memory locations.
*/ */
#define AV_COPYU(n, d, s) AV_WN##n(d, AV_RN##n(s)); #define AV_COPYU(n, d, s) \
do { \
uint##n##_t val = AV_RN##n(s); \
AV_WN##n(d, val); \
} while (0)
#ifndef AV_COPY16U #ifndef AV_COPY16U
# define AV_COPY16U(d, s) AV_COPYU(16, d, s) # define AV_COPY16U(d, s) AV_COPYU(16, d, s)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment