diff options
| author | Martin Storsjö <martin@martin.st> | 2016-08-01 09:04:43 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2016-08-02 21:18:18 +0300 |
| commit | fc94a1acc27ab7296edce3fa81ef36691af5c134 (patch) | |
| tree | 52b3dfbd188addf1c72675f8dbe856037bbe262d /libavutil/intreadwrite.h | |
| parent | 9806b9ab5c7fb2ac5efd8ffa8713fea0c5fd218d (diff) | |
| download | ffmpeg-fc94a1acc27ab7296edce3fa81ef36691af5c134.tar.gz | |
Revert "libavutil: Use an intermediate variable in AV_COPY*U"
This reverts commit 014773b66bdff4de24f384066d1a85d2a5bb6774.
Since 230b1c070, the bytewise AV_W*() macros only expand their
argument once, i.e. doing exactly the same change as was done
in the AV_COPY*U macros, so this change is no longer necessary.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavutil/intreadwrite.h')
| -rw-r--r-- | libavutil/intreadwrite.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h index 32747b21cb..fdb91d6bed 100644 --- a/libavutil/intreadwrite.h +++ b/libavutil/intreadwrite.h @@ -478,11 +478,7 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; * memory locations. */ -#define AV_COPYU(n, d, s) \ - do { \ - uint##n##_t val = AV_RN##n(s); \ - AV_WN##n(d, val); \ - } while (0) +#define AV_COPYU(n, d, s) AV_WN##n(d, AV_RN##n(s)); #ifndef AV_COPY16U # define AV_COPY16U(d, s) AV_COPYU(16, d, s) |