Revert "Don't use expressions with side effects in macro parameters"

This reverts commit 25bacd0a0c32ae682e6f411b1ac9020aeaabca72.

Since 230b1c070, the bytewise AV_W*() macros only expand their
argument once, so revert to the more readable version of these.

Signed-off-by: Martin Storsjö <martin@martin.st>

1 files changed, 2 insertions, 4 deletions

diff --git a/libavformat/xmv.c b/libavformat/xmv.c
index fa391560f0..b2112b0e95 100644
--- a/libavformat/xmv.c
+++ b/libavformat/xmv.c
@@ -512,10 +512,8 @@ static int xmv_fetch_video_packet(AVFormatContext *s,
      * WMV2 is little-endian.
      * TODO: This manual swap is of course suboptimal.
      */
-    for (i = 0; i < frame_size; i += 4) {
-        uint32_t val = avio_rl32(pb);
-        AV_WB32(pkt->data + i, val);
-    }
+    for (i = 0; i < frame_size; i += 4)
+        AV_WB32(pkt->data + i, avio_rl32(pb));
 
     pkt->stream_index = video->stream_index;