From fc94a1acc27ab7296edce3fa81ef36691af5c134 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Mon, 1 Aug 2016 09:04:43 +0300 Subject: Revert "libavutil: Use an intermediate variable in AV_COPY*U" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ö --- libavutil/intreadwrite.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'libavutil') 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) -- cgit v1.2.3