[FFmpeg-cvslog] Include sys/time.h before sys/resource.h

Mans Rullgard git at videolan.org
Wed Oct 24 13:21:53 CEST 2012


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sun Oct 14 00:27:26 2012 +0100| [3f65eff408f78f9f71f250530f20e5870eb49b0c] | committer: Mans Rullgard

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 at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f65eff408f78f9f71f250530f20e5870eb49b0c
---

 avconv.c   |    1 +
 cmdutils.c |    1 +
 2 files changed, 2 insertions(+)

diff --git a/avconv.c b/avconv.c
index 759e1c0..6f67711 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 34c52ca..6570968 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
 



More information about the ffmpeg-cvslog mailing list