[SCM] libav/experimental: * Also include time.h for nanosleep() by: Philipp Matthias Hahn <pmhahn at titan.lahn.de>
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:31:04 UTC 2013
The following commit has been merged in the experimental branch:
commit 608d0dee6fdb81ad260e74071a329353d74eef39
Author: Zdenek Kabelac <kabi at informatics.muni.cz>
Date: Mon Feb 18 10:20:03 2002 +0000
* Also include time.h for nanosleep()
by: Philipp Matthias Hahn <pmhahn at titan.lahn.de>
Originally committed as revision 309 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/ffserver.c b/ffserver.c
index d2d7479..f4a6250 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 774c5b0..7dd6fd7 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;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list