diff options
| author | Zdenek Kabelac <kabi@informatics.muni.cz> | 2002-02-18 10:20:03 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <kabi@informatics.muni.cz> | 2002-02-18 10:20:03 +0000 |
| commit | 608d0dee6fdb81ad260e74071a329353d74eef39 (patch) | |
| tree | 5927e154882499bde43f750fb9d558b1ee530a7f | |
| parent | d6a4c0b111d41bbf1effd771605dfb71fd8903cf (diff) | |
| download | ffmpeg-608d0dee6fdb81ad260e74071a329353d74eef39.tar.gz | |
* Also include time.h for nanosleep()
by: Philipp Matthias Hahn <pmhahn@titan.lahn.de>
Originally committed as revision 309 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | ffserver.c | 5 | ||||
| -rw-r--r-- | libav/grab.c | 2 |
2 files changed, 4 insertions, 3 deletions
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; |