virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

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

Browse Source 
This reverts commit 25bacd0a0c.

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>
This commit is contained in:
Martin Storsjö 2016-08-01 09:04:33 +03:00
parent f79d847400
commit 9806b9ab5c
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/dxv.c
View File

@ -121,10 +121,8 @@ static int dxv_decompress_dxt1(AVCodecContext *avctx)
int pos = 2;
/* Copy the first two elements */
value = bytestream2_get_le32(gbc);
AV_WL32(ctx->tex_data, value);
value = bytestream2_get_le32(gbc);
AV_WL32(ctx->tex_data + 4, value);
AV_WL32(ctx->tex_data, bytestream2_get_le32(gbc));
AV_WL32(ctx->tex_data + 4, bytestream2_get_le32(gbc));
/* Process input until the whole texture has been filled */
while (pos + 2 <= ctx->tex_size / 4) {
@ -174,14 +172,10 @@ static int dxv_decompress_dxt5(AVCodecContext *avctx)
int probe, check;
/* Copy the first four elements */
value = bytestream2_get_le32(gbc);
AV_WL32(ctx->tex_data + 0, value);
value = bytestream2_get_le32(gbc);
AV_WL32(ctx->tex_data + 4, value);
value = bytestream2_get_le32(gbc);
AV_WL32(ctx->tex_data + 8, value);
value = bytestream2_get_le32(gbc);
AV_WL32(ctx->tex_data + 12, value);
AV_WL32(ctx->tex_data + 0, bytestream2_get_le32(gbc));
AV_WL32(ctx->tex_data + 4, bytestream2_get_le32(gbc));
AV_WL32(ctx->tex_data + 8, bytestream2_get_le32(gbc));
AV_WL32(ctx->tex_data + 12, bytestream2_get_le32(gbc));
/* Process input until the whole texture has been filled */
while (pos + 2 <= ctx->tex_size / 4) {

6
libavformat/xmv.c
View File

@ -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;