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

Reimar Döffinger committed 16 years ago

Commit 30ad1a61 parent 4f798a64 files · +2 −2Browse files

Unified · Split

4 files

libavcodec/mdct_tablegen.c +0 −1
libavcodec/mdct_tablegen.h +1 −0
libavcodec/qdm2_tablegen.c +0 −1
libavcodec/qdm2_tablegen.h +1 −0

libavcodec/mdct_tablegen.c+0−1

@@ -22,7 +22,6 @@ · 21 unmodified lines
22		22
23	#include <stdlib.h>	23	#include <stdlib.h>
24	#define CONFIG_HARDCODED_TABLES 0	24	#define CONFIG_HARDCODED_TABLES 0
25	#define av_cold
26	#define SINETABLE_CONST	25	#define SINETABLE_CONST
27	#define SINETABLE(size) \	26	#define SINETABLE(size) \
28	float ff_sine_##size[size]	27	float ff_sine_##size[size]

libavcodec/mdct_tablegen.h+1−0

@@ -24,6 +24,7 @@ · 23 unmodified lines
24	// do not use libavutil/mathematics.h since this is compiled both	24	// do not use libavutil/mathematics.h since this is compiled both
25	// for the host and the target and config.h is only valid for the target	25	// for the host and the target and config.h is only valid for the target
26	#include <math.h>	26	#include <math.h>
		27	#include "../libavutil/attributes.h"
27		28
28	#if !CONFIG_HARDCODED_TABLES	29	#if !CONFIG_HARDCODED_TABLES
29	SINETABLE( 32);	30	SINETABLE( 32);

libavcodec/qdm2_tablegen.c+0−1

@@ -21,7 +21,6 @@ · 20 unmodified lines
21	*/	21	*/
22		22
23	#include <stdlib.h>	23	#include <stdlib.h>
24	#define av_cold
25	#define CONFIG_HARDCODED_TABLES 0	24	#define CONFIG_HARDCODED_TABLES 0
26	#include "qdm2_tablegen.h"	25	#include "qdm2_tablegen.h"
27	#include "tableprint.h"	26	#include "tableprint.h"

libavcodec/qdm2_tablegen.h+1−0

@@ -25,6 +25,7 @@ · 24 unmodified lines
25		25
26	#include <stdint.h>	26	#include <stdint.h>
27	#include <math.h>	27	#include <math.h>
		28	#include "../libavutil/attributes.h"
28		29
29	#define SOFTCLIP_THRESHOLD 27600	30	#define SOFTCLIP_THRESHOLD 27600
30	#define HARDCLIP_THRESHOLD 35716	31	#define HARDCLIP_THRESHOLD 35716