aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-11-13 21:57:13 +0100
committerAnton Khirnov <anton@khirnov.net>2013-01-06 13:31:39 +0100
commitaa15afb7ce850e2ac688efdef189df5da817a646 (patch)
tree402d18463e685aa4f79c725f1be81026bcc1fa78
parent10c26e928a92c413f569183af0b26a4eca4d6ef1 (diff)
downloadffmpeg-aa15afb7ce850e2ac688efdef189df5da817a646.tar.gz
4xm: simplify code with FFSWAP
-rw-r--r--libavcodec/4xm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 304dfc0c13..446c085f1b 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -760,7 +760,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
int buf_size = avpkt->size;
FourXContext *const f = avctx->priv_data;
AVFrame *picture = data;
- AVFrame *p, temp;
+ AVFrame *p;
int i, frame_4cc, frame_size, ret;
frame_4cc = AV_RL32(buf);
@@ -821,9 +821,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
frame_size = buf_size - 12;
}
- temp = f->current_picture;
- f->current_picture = f->last_picture;
- f->last_picture = temp;
+ FFSWAP(AVFrame, f->current_picture, f->last_picture);
p = &f->current_picture;
avctx->coded_frame = p;