diff options
| author | Martin Storsjö <martin@martin.st> | 2016-08-01 09:04:33 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2016-08-02 21:18:12 +0300 |
| commit | 9806b9ab5c7fb2ac5efd8ffa8713fea0c5fd218d (patch) | |
| tree | f7fe4d7bb8f95a5fdf8aeefee4bf9eda31d05355 /libavformat/xmv.c | |
| parent | f79d847400d218cfd0b95f10358fe6e65ec3c9c4 (diff) | |
| download | ffmpeg-9806b9ab5c7fb2ac5efd8ffa8713fea0c5fd218d.tar.gz | |
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>
Diffstat (limited to 'libavformat/xmv.c')
| -rw-r--r-- | libavformat/xmv.c | 6 |
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; |