[FFmpeg-cvslog] r9151 - trunk/libavcodec/vmdav.c

[kostya]

Author: kostya
Date: Tue May 29 18:43:25 2007
New Revision: 9151

Log:
Do proper frame swapping so VMD video decoder works again

Modified:
   trunk/libavcodec/vmdav.c

Modified: trunk/libavcodec/vmdav.c
==============================================================================
--- trunk/libavcodec/vmdav.c	(original)
+++ trunk/libavcodec/vmdav.c	Tue May 29 18:43:25 2007
@@ -380,14 +380,13 @@ static int vmdvideo_decode_frame(AVCodec
     /* make the palette available on the way out */
     memcpy(s->frame.data[1], s->palette, PALETTE_COUNT * 4);
 
-    if (s->prev_frame.data[0])
-        avctx->release_buffer(avctx, &s->prev_frame);
-
     /* shuffle frames */
-    s->prev_frame = s->frame;
+    FFSWAP(AVFrame, s->frame, s->prev_frame);
+    if (s->frame.data[0])
+        avctx->release_buffer(avctx, &s->frame);
 
     *data_size = sizeof(AVFrame);
-    *(AVFrame*)data = s->frame;
+    *(AVFrame*)data = s->prev_frame;
 
     /* report that the buffer was completely consumed */
     return buf_size;