summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-06-26 20:28:44 +0000
committerMåns Rullgård <mans@mansr.com>2010-06-26 20:28:44 +0000
commit69d12904da10ffa9a5f414f03db776bd1dec8c66 (patch)
treeacff579a681916222dc3870d35865f73df5043c9
parent7f02d3570a6563bd84bf48e7b00b7855a9b194c6 (diff)
downloadffmpeg-69d12904da10ffa9a5f414f03db776bd1dec8c66.tar.gz
Remove unnecessary ../ from include directives
Originally committed as revision 23806 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/aac_tablegen.h2
-rw-r--r--libavcodec/aacps_tablegen.h4
-rw-r--r--libavcodec/mdct_tablegen.h2
-rw-r--r--libavcodec/pcm_tablegen.h2
-rw-r--r--libavcodec/qdm2_tablegen.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/aac_tablegen.h b/libavcodec/aac_tablegen.h
index 630071dd1d..3a820ba673 100644
--- a/libavcodec/aac_tablegen.h
+++ b/libavcodec/aac_tablegen.h
@@ -28,7 +28,7 @@
#if CONFIG_HARDCODED_TABLES
#include "libavcodec/aac_tables.h"
#else
-#include "../libavutil/mathematics.h"
+#include "libavutil/mathematics.h"
float ff_aac_pow2sf_tab[428];
void ff_aac_tableinit(void)
diff --git a/libavcodec/aacps_tablegen.h b/libavcodec/aacps_tablegen.h
index 3c1b27decd..c7e062bdb7 100644
--- a/libavcodec/aacps_tablegen.h
+++ b/libavcodec/aacps_tablegen.h
@@ -29,8 +29,8 @@
#define ps_tableinit()
#include "libavcodec/aacps_tables.h"
#else
-#include "../libavutil/common.h"
-#include "../libavutil/mathematics.h"
+#include "libavutil/common.h"
+#include "libavutil/mathematics.h"
#define NR_ALLPASS_BANDS20 30
#define NR_ALLPASS_BANDS34 50
#define PS_AP_LINKS 3
diff --git a/libavcodec/mdct_tablegen.h b/libavcodec/mdct_tablegen.h
index 86f858b4c0..51a0094221 100644
--- a/libavcodec/mdct_tablegen.h
+++ b/libavcodec/mdct_tablegen.h
@@ -24,7 +24,7 @@
// do not use libavutil/libm.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"
+#include "libavutil/attributes.h"
#if !CONFIG_HARDCODED_TABLES
SINETABLE( 32);
diff --git a/libavcodec/pcm_tablegen.h b/libavcodec/pcm_tablegen.h
index 8921baaba2..3d641b05bb 100644
--- a/libavcodec/pcm_tablegen.h
+++ b/libavcodec/pcm_tablegen.h
@@ -24,7 +24,7 @@
#define PCM_TABLEGEN_H
#include <stdint.h>
-#include "../libavutil/attributes.h"
+#include "libavutil/attributes.h"
/* from g711.c by SUN microsystems (unrestricted use) */
diff --git a/libavcodec/qdm2_tablegen.h b/libavcodec/qdm2_tablegen.h
index de9ff0c902..6718f58b09 100644
--- a/libavcodec/qdm2_tablegen.h
+++ b/libavcodec/qdm2_tablegen.h
@@ -25,7 +25,7 @@
#include <stdint.h>
#include <math.h>
-#include "../libavutil/attributes.h"
+#include "libavutil/attributes.h"
#define SOFTCLIP_THRESHOLD 27600
#define HARDCLIP_THRESHOLD 35716