[FFmpeg-cvslog] 4xm: simplify code with FFSWAP

Anton Khirnov git at videolan.org
Sun Jan 6 23:45:23 CET 2013


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Nov 13 21:57:13 2012 +0100| [aa15afb7ce850e2ac688efdef189df5da817a646] | committer: Anton Khirnov

4xm: simplify code with FFSWAP

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa15afb7ce850e2ac688efdef189df5da817a646
---

 libavcodec/4xm.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 304dfc0..446c085 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;



More information about the ffmpeg-cvslog mailing list