aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFalk Hüffner <mellum@users.sourceforge.net>2002-07-04 13:41:27 +0000
committerFalk Hüffner <mellum@users.sourceforge.net>2002-07-04 13:41:27 +0000
commit02da51ec6073e2ab5ef536e6ecc2c1cbc67f1952 (patch)
tree764f8005a24822024cc4c1bdad50b36045b050f1
parenta86c461c6b6500ae8c47f87c03ecba42887e6cb3 (diff)
downloadffmpeg-02da51ec6073e2ab5ef536e6ecc2c1cbc67f1952.tar.gz
* Move "restrict" fallback to common.h
* Don't include config.h in dsputil.c Originally committed as revision 721 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/common.h5
-rw-r--r--libavcodec/dsputil.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/libavcodec/common.h b/libavcodec/common.h
index fe97d4c431..9f2102aac6 100644
--- a/libavcodec/common.h
+++ b/libavcodec/common.h
@@ -35,6 +35,11 @@
#endif /* HAVE_AV_CONFIG_H */
+/* Suppress restrict if it was not defined in config.h. */
+#ifndef restrict
+#define restrict
+#endif
+
#ifdef CONFIG_WIN32
/* windows */
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index c1e9fee91c..e1a4e9c291 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -21,12 +21,6 @@
#include "avcodec.h"
#include "dsputil.h"
#include "simple_idct.h"
-#include "config.h"
-
-/* Suppress restrict if it was not defined in config.h */
-#ifndef restrict
-#define restrict
-#endif
void (*ff_idct)(DCTELEM *block);
void (*ff_idct_put)(UINT8 *dest, int line_size, DCTELEM *block);