Commit 403940de authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/mpegvideo: Use FFSWAP to exchange pointers

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent f86e7c5d
...@@ -846,10 +846,7 @@ static int init_duplicate_context(MpegEncContext *s) ...@@ -846,10 +846,7 @@ static int init_duplicate_context(MpegEncContext *s)
} }
if (s->avctx->codec_tag == AV_RL32("VCR2")) { if (s->avctx->codec_tag == AV_RL32("VCR2")) {
// exchange uv // exchange uv
int16_t (*tmp)[64]; FFSWAP(void *, s->pblocks[4], s->pblocks[5]);
tmp = s->pblocks[4];
s->pblocks[4] = s->pblocks[5];
s->pblocks[5] = tmp;
} }
if (s->out_format == FMT_H263) { if (s->out_format == FMT_H263) {
...@@ -927,10 +924,7 @@ int ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src) ...@@ -927,10 +924,7 @@ int ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src)
} }
if (dst->avctx->codec_tag == AV_RL32("VCR2")) { if (dst->avctx->codec_tag == AV_RL32("VCR2")) {
// exchange uv // exchange uv
int16_t (*tmp)[64]; FFSWAP(void *, dst->pblocks[4], dst->pblocks[5]);
tmp = dst->pblocks[4];
dst->pblocks[4] = dst->pblocks[5];
dst->pblocks[5] = tmp;
} }
if (!dst->edge_emu_buffer && if (!dst->edge_emu_buffer &&
(ret = frame_size_alloc(dst, dst->linesize)) < 0) { (ret = frame_size_alloc(dst, dst->linesize)) < 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment