[x264-devel] Fix wrong conditional inclusion of inttypes.h

[Reynaldo H. Verdejo Pinochet]

x264 | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo at collabora.com> | Wed Jan  4 13:16:12 2012 -0300| [c0d698859c36be611d465f968762f042853be817] | committer: Jason Garrett-Glaser

Fix wrong conditional inclusion of inttypes.h
inttypes.h is required by encoder/ratecontrol.c for SCNxxx macros, and HAVE_STDINT_H does not imply having inttypes.h.
stdint.h is a subset of inttypes.h, but this isn't enough for x264.
This change fixes building x264 with Android's toolchain.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=c0d698859c36be611d465f968762f042853be817
---

 common/osdep.h |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/common/osdep.h b/common/osdep.h
index dbb0937..a55b69d 100644
--- a/common/osdep.h
+++ b/common/osdep.h
@@ -31,15 +31,10 @@
 #define _FILE_OFFSET_BITS 64
 #include <stdio.h>
 #include <sys/stat.h>
+#include <inttypes.h>
 
 #include "config.h"
 
-#if HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
-
 #if !HAVE_LOG2F
 #define log2f(x) (logf(x)/0.693147180559945f)
 #define log2(x) (log(x)/0.693147180559945)