The header is only really used in one place, so there is no need
or sense in having a separate header.
---
libavcodec/aac_tablegen.h | 11 ++++-------
libavcodec/aac_tablegen_decl.h | 36 ------------------------------------
libavcodec/aaccoder.c | 1 +
libavcodec/aacdec.c | 1 +
libavcodec/aacenc.c | 2 +-
libavcodec/aactab.h | 1 -
6 files changed, 7 insertions(+), 45 deletions(-)
delete mode 100644 libavcodec/aac_tablegen_decl.h
diff --git a/libavcodec/aac_tablegen.h b/libavcodec/aac_tablegen.h
index 4486e1a..920c18c 100644
--- a/libavcodec/aac_tablegen.h
+++ b/libavcodec/aac_tablegen.h
@@ -23,16 +23,13 @@
#ifndef AVCODEC_AAC_TABLEGEN_H
#define AVCODEC_AAC_TABLEGEN_H
-#include "aac_tablegen_decl.h"
-
#if CONFIG_HARDCODED_TABLES
-#include "libavcodec/aac_tables.h"
+#define ff_aac_tableinit()
+extern const float ff_aac_pow2sf_tab[428];
#else
-#include "libavutil/mathematics.h"
-#include "libavcodec/aac.h"
-float ff_aac_pow2sf_tab[428];
+static float ff_aac_pow2sf_tab[428];
-void ff_aac_tableinit(void)
+static inline void ff_aac_tableinit(void)
{
int i;
for (i = 0; i < 428; i++)
diff --git a/libavcodec/aac_tablegen_decl.h b/libavcodec/aac_tablegen_decl.h
deleted file mode 100644
index 2373ed8..0000000
--- a/libavcodec/aac_tablegen_decl.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Header file for hardcoded AAC tables
- *
- * Copyright (c) 2010 Alex Converse <[email protected]>
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_AAC_TABLEGEN_DECL_H
-#define AVCODEC_AAC_TABLEGEN_DECL_H
-
-#include "config.h"
-
-#if CONFIG_HARDCODED_TABLES
-#define ff_aac_tableinit()
-extern const float ff_aac_pow2sf_tab[428];
-#else
-void ff_aac_tableinit(void);
-extern float ff_aac_pow2sf_tab[428];
-#endif /* CONFIG_HARDCODED_TABLES */
-
-#endif /* AVCODEC_AAC_TABLEGEN_DECL_H */
diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c
index 83d3734..863b180 100644
--- a/libavcodec/aaccoder.c
+++ b/libavcodec/aaccoder.c
@@ -38,6 +38,7 @@
#include "aac.h"
#include "aacenc.h"
#include "aactab.h"
+#include "aac_tablegen.h"
/** bits needed to code codebook run value for long windows */
static const uint8_t run_value_bits_long[64] = {
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 69aacb8..d4575f7 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -93,6 +93,7 @@
#include "aac.h"
#include "aactab.h"
#include "aacdectab.h"
+#include "aac_tablegen.h"
#include "cbrt_tablegen.h"
#include "sbr.h"
#include "aacsbr.h"
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 92ff4b0..2aa6b23 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -40,7 +40,7 @@
#include "aac.h"
#include "aactab.h"
#include "aacenc.h"
-
+#include "aac_tablegen.h"
#include "psymodel.h"
#define AAC_MAX_CHANNELS 6
diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h
index c76d65d..c6b9dc1 100644
--- a/libavcodec/aactab.h
+++ b/libavcodec/aactab.h
@@ -32,7 +32,6 @@
#include "libavutil/mem.h"
#include "aac.h"
-#include "aac_tablegen_decl.h"
#include <stdint.h>
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
