[SCM] libav/experimental: Do proper frame swapping so VMD video decoder works again
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:00:36 UTC 2013
The following commit has been merged in the experimental branch:
commit 3dba31aa0d5f0fdca5c002cea9c0757a90ec21f0
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date: Tue May 29 16:43:25 2007 +0000
Do proper frame swapping so VMD video decoder works again
Originally committed as revision 9151 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index e1a5c47..5b8b8cf 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -380,14 +380,13 @@ static int vmdvideo_decode_frame(AVCodecContext *avctx,
/* 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;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list