File avifile-UINT64_C.patch of Package avifile

diff -urN avifile-0.7-0.7.45.orig/lib/aviread/FFReadHandler.cpp avifile-0.7-0.7.45.fix1/lib/aviread/FFReadHandler.cpp
--- avifile-0.7-0.7.45.orig/lib/aviread/FFReadHandler.cpp	2013-05-18 21:06:57.115712974 +0800
+++ avifile-0.7-0.7.45.fix1/lib/aviread/FFReadHandler.cpp	2013-05-19 01:22:00.607393000 +0800
@@ -1,12 +1,11 @@
+#define __STDC_CONSTANT_MACROS
 #include "FFReadHandler.h"
 #include "FFReadStream.h"
 #include "avm_output.h"
 
-#ifndef int64_t_C
-#define int64_t_C(c)     (c ## LL)
-#define uint64_t_C(c)    (c ## ULL)
-#endif
-#include "avformat.h"
+extern "C" {
+#include <libavformat/avformat.h>
+}
 
 #include <stdio.h>
 #include <stdlib.h>
diff -urN avifile-0.7-0.7.45.orig/lib/aviread/FFReadStream.cpp avifile-0.7-0.7.45.fix1/lib/aviread/FFReadStream.cpp
--- avifile-0.7-0.7.45.orig/lib/aviread/FFReadStream.cpp	2013-05-18 21:06:57.114712987 +0800
+++ avifile-0.7-0.7.45.fix1/lib/aviread/FFReadStream.cpp	2013-05-19 01:22:15.949201201 +0800
@@ -1,13 +1,12 @@
+#define __STDC_CONSTANT_MACROS
 #include "FFReadStream.h"
 #include "FFReadHandler.h"
 #include "avm_fourcc.h"
 #include "avm_output.h"
 
-#ifndef int64_t_C
-#define int64_t_C(c)     (c ## LL)
-#define uint64_t_C(c)    (c ## ULL)
-#endif
-#include "avformat.h"
+extern "C" {
+#include <libavformat/avformat.h>
+}
 
 #include <stdio.h>
 #include <stdlib.h>
diff -urN avifile-0.7-0.7.45.orig/plugins/libffmpeg/FFAudioDecoder.h avifile-0.7-0.7.45.fix1/plugins/libffmpeg/FFAudioDecoder.h
--- avifile-0.7-0.7.45.orig/plugins/libffmpeg/FFAudioDecoder.h	2013-05-18 21:06:57.063713624 +0800
+++ avifile-0.7-0.7.45.fix1/plugins/libffmpeg/FFAudioDecoder.h	2013-05-19 01:22:51.226760171 +0800
@@ -1,8 +1,11 @@
+#define __STDC_CONSTANT_MACROS
 #ifndef AVIFILE_FFAUDIODECODER_H
 #define AVIFILE_FFAUDIODECODER_H
 
 #include "audiodecoder.h"
-#include "avcodec.h"
+extern "C" {
+#include <libavcodec/avcodec.h>
+}
 
 AVM_BEGIN_NAMESPACE;
 
diff -urN avifile-0.7-0.7.45.orig/plugins/libffmpeg/FFVideoDecoder.h avifile-0.7-0.7.45.fix1/plugins/libffmpeg/FFVideoDecoder.h
--- avifile-0.7-0.7.45.orig/plugins/libffmpeg/FFVideoDecoder.h	2013-05-18 21:06:57.062713637 +0800
+++ avifile-0.7-0.7.45.fix1/plugins/libffmpeg/FFVideoDecoder.h	2013-05-19 01:23:07.095561784 +0800
@@ -1,13 +1,11 @@
+#define __STDC_CONSTANT_MACROS
 #ifndef AVIFILE_FFVIDEODECODER_H
 #define AVIFILE_FFVIDEODECODER_H
 
 #include "videodecoder.h"
-
-#ifndef int64_t_C
-#define int64_t_C(c)     (c ## LL)
-#define uint64_t_C(c)    (c ## ULL)
-#endif
-#include "avformat.h"
+extern "C" {
+#include <libavformat/avformat.h>
+}
 
 AVM_BEGIN_NAMESPACE;
 
diff -urN avifile-0.7-0.7.45.orig/plugins/libffmpeg/FFVideoEncoder.h avifile-0.7-0.7.45.fix1/plugins/libffmpeg/FFVideoEncoder.h
--- avifile-0.7-0.7.45.orig/plugins/libffmpeg/FFVideoEncoder.h	2013-05-18 21:06:57.062713637 +0800
+++ avifile-0.7-0.7.45.fix1/plugins/libffmpeg/FFVideoEncoder.h	2013-05-19 01:23:21.577380736 +0800
@@ -1,8 +1,11 @@
+#define __STDC_CONSTANT_MACROS
 #ifndef AVIFILE_FFVIDEOENCODER_H
 #define AVIFILE_FFVIDEOENCODER_H
 
 #include "videoencoder.h"
-#include "avcodec.h"
+extern "C" {
+#include <libavcodec/avcodec.h>
+}
 
 #include <stdlib.h>
 
diff -urN avifile-0.7-0.7.45.orig/plugins/libffmpeg/fillplugins.h avifile-0.7-0.7.45.fix1/plugins/libffmpeg/fillplugins.h
--- avifile-0.7-0.7.45.orig/plugins/libffmpeg/fillplugins.h	2013-05-18 21:06:57.063713624 +0800
+++ avifile-0.7-0.7.45.fix1/plugins/libffmpeg/fillplugins.h	2013-05-19 01:23:34.306221604 +0800
@@ -1,16 +1,12 @@
+#define __STDC_CONSTANT_MACROS
 #ifndef FFMPEG_FILLPLUGINS_H
 #define FFMPEG_FILLPLUGINS_H
 
 #include "infotypes.h"
 #include "avm_fourcc.h"
-
-//#include "avcodec.h"
-#ifndef int64_t_C
-#define int64_t_C(c)     (c ## LL)
-#define uint64_t_C(c)    (c ## ULL)
-#endif
-#include "avformat.h"
-#include "opt.h"
+extern "C" {
+#include <libavformat/avformat.h>
+}
 
 #include <string.h>
 #include <stdlib.h>