diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
index d75131b142..2d811c5b25 100644
--- a/libavcodec/roqvideodec.c
+++ b/libavcodec/roqvideodec.c
@@ -174,12 +174,17 @@ static int roq_decode_frame(AVCodecContext *avctx,
                             uint8_t *buf, int buf_size)
 {
     RoqContext *s = avctx->priv_data;
+    int copy= !s->current_frame->data[0];
 
     if (avctx->reget_buffer(avctx, s->current_frame)) {
         av_log(avctx, AV_LOG_ERROR, "  RoQ: get_buffer() failed\n");
         return -1;
     }
 
+    if(copy)
+        av_picture_copy((AVPicture*)s->current_frame, (AVPicture*)s->last_frame,
+                        avctx->pix_fmt, avctx->width, avctx->height);
+
     s->buf = buf;
     s->size = buf_size;
     roqvideo_decode_frame(s);