[FFmpeg-cvslog] avcodec/libxvid: add HAVE_UNISTD_H around #include <unistd.h>
Michael Niedermayer
git at videolan.org
Tue Jul 8 02:03:16 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 8 01:55:47 2014 +0200| [39ea21713c545607d3269d4414e3fe6224cf9a21] | committer: Michael Niedermayer
avcodec/libxvid: add HAVE_UNISTD_H around #include <unistd.h>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=39ea21713c545607d3269d4414e3fe6224cf9a21
---
libavcodec/libxvid.c | 5 ++++-
libavcodec/libxvid_rc.c | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c
index 88d748e..e60b2d8 100644
--- a/libavcodec/libxvid.c
+++ b/libavcodec/libxvid.c
@@ -26,7 +26,6 @@
*/
#include <xvid.h>
-#include <unistd.h>
#include "avcodec.h"
#include "internal.h"
#include "libavutil/file.h"
@@ -36,6 +35,10 @@
#include "libxvid.h"
#include "mpegvideo.h"
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
/**
* Buffer management macros.
*/
diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c
index 5da435b..1351dcd 100644
--- a/libavcodec/libxvid_rc.c
+++ b/libavcodec/libxvid_rc.c
@@ -22,13 +22,16 @@
#include "config.h"
#include <xvid.h>
-#include <unistd.h>
#include "libavutil/attributes.h"
#include "libavutil/file.h"
#include "avcodec.h"
#include "libxvid.h"
#include "mpegvideo.h"
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#undef NDEBUG
#include <assert.h>
More information about the ffmpeg-cvslog
mailing list