aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2010-03-29 21:32:38 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2010-03-29 21:32:38 +0000
commit30ad1a66517c5533014ad8b2180bfcf06bb12d80 (patch)
tree5f71e453891974d0a027cd20fdb3f8812ee2212f
parent4f798a6ab2cabd96df0bdff758176752bb2c4d82 (diff)
downloadffmpeg-30ad1a66517c5533014ad8b2180bfcf06bb12d80.tar.gz
Include appropriate header in table generators instead of using a dummy
av_cold define. Originally committed as revision 22723 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mdct_tablegen.c1
-rw-r--r--libavcodec/mdct_tablegen.h1
-rw-r--r--libavcodec/qdm2_tablegen.c1
-rw-r--r--libavcodec/qdm2_tablegen.h1
4 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mdct_tablegen.c b/libavcodec/mdct_tablegen.c
index f04502f181..a6b13c345b 100644
--- a/libavcodec/mdct_tablegen.c
+++ b/libavcodec/mdct_tablegen.c
@@ -22,7 +22,6 @@
#include <stdlib.h>
#define CONFIG_HARDCODED_TABLES 0
-#define av_cold
#define SINETABLE_CONST
#define SINETABLE(size) \
float ff_sine_##size[size]
diff --git a/libavcodec/mdct_tablegen.h b/libavcodec/mdct_tablegen.h
index af652e7457..1722c3b4d0 100644
--- a/libavcodec/mdct_tablegen.h
+++ b/libavcodec/mdct_tablegen.h
@@ -24,6 +24,7 @@
// do not use libavutil/mathematics.h since this is compiled both
// for the host and the target and config.h is only valid for the target
#include <math.h>
+#include "../libavutil/attributes.h"
#if !CONFIG_HARDCODED_TABLES
SINETABLE( 32);
diff --git a/libavcodec/qdm2_tablegen.c b/libavcodec/qdm2_tablegen.c
index b311e7f4db..d23493c741 100644
--- a/libavcodec/qdm2_tablegen.c
+++ b/libavcodec/qdm2_tablegen.c
@@ -21,7 +21,6 @@
*/
#include <stdlib.h>
-#define av_cold
#define CONFIG_HARDCODED_TABLES 0
#include "qdm2_tablegen.h"
#include "tableprint.h"
diff --git a/libavcodec/qdm2_tablegen.h b/libavcodec/qdm2_tablegen.h
index 83d8c2d095..de9ff0c902 100644
--- a/libavcodec/qdm2_tablegen.h
+++ b/libavcodec/qdm2_tablegen.h
@@ -25,6 +25,7 @@
#include <stdint.h>
#include <math.h>
+#include "../libavutil/attributes.h"
#define SOFTCLIP_THRESHOLD 27600
#define HARDCLIP_THRESHOLD 35716