diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index d593a0de78..162d194fc7 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -677,7 +677,8 @@ void avcodec_flush_buffers(AVCodecContext *avctx)
            if(s->picture[i].data[0] && (   s->picture[i].type == FF_BUFFER_TYPE_INTERNAL
                                         || s->picture[i].type == FF_BUFFER_TYPE_USER))
             avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]);
-        }
+	}
+	s->last_picture.data[0] = s->next_picture.data[0] = NULL;
         break;
     default:
         //FIXME