aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-10-14 00:27:26 +0100
committerMans Rullgard <mans@mansr.com>2012-10-23 12:00:21 +0100
commit3f65eff408f78f9f71f250530f20e5870eb49b0c (patch)
tree7d93985870bca16be4298b15929bd72c57c0676e
parenta1f6ad69c77917a348650a745752535503a44f88 (diff)
downloadffmpeg-3f65eff408f78f9f71f250530f20e5870eb49b0c.tar.gz
Include sys/time.h before sys/resource.h
Some systems require sys/time.h being explicitly included before sys/resource.h. The configure check already does this. Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r--avconv.c1
-rw-r--r--cmdutils.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/avconv.c b/avconv.c
index 759e1c0ce8..6f6771186a 100644
--- a/avconv.c
+++ b/avconv.c
@@ -53,6 +53,7 @@
# include "libavfilter/buffersink.h"
#if HAVE_SYS_RESOURCE_H
+#include <sys/time.h>
#include <sys/types.h>
#include <sys/resource.h>
#elif HAVE_GETPROCESSTIMES
diff --git a/cmdutils.c b/cmdutils.c
index 34c52ca136..6570968526 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -49,6 +49,7 @@
#include "libavformat/network.h"
#endif
#if HAVE_SYS_RESOURCE_H
+#include <sys/time.h>
#include <sys/resource.h>
#endif