diff --git a/ffserver.c b/ffserver.c
index d2d74796c9..f4a6250b1b 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -880,8 +880,9 @@ static int http_prepare_data(HTTPContext *c)
                         }
                     }
                 } else {
-                send_it:
-                    av_write_packet(&c->fmt_ctx, &pkt);
+		send_it:
+                    if (av_write_packet(&c->fmt_ctx, &pkt))
+			c->state = HTTPSTATE_SEND_DATA_TRAILER;
                 }
                 
                 av_free_packet(&pkt);
diff --git a/libav/grab.c b/libav/grab.c
index 774c5b0e79..7dd6fd7c1f 100644
--- a/libav/grab.c
+++ b/libav/grab.c
@@ -23,7 +23,7 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/time.h>
-
+#include <time.h>
 
 typedef struct {
     int fd;