[FFmpeg-devel] [PATCH 3/3] libavcodec/aacsbr_tablegen: fix tablegen on windows

[Hendrik Leppkes]

On Wed, Dec 2, 2015 at 9:52 AM, Hendrik Leppkes <h.leppkes at gmail.com> wrote:
> Including these headers is not needed and breaks building on Windows as it
> tries to activate the full compat tools, which are not needed for host
> tools.
> ---
>  libavcodec/aacsbr_fixed_tablegen.c  | 3 ---
>  libavcodec/aacsbr_tablegen.c        | 3 ---
>  libavcodec/aacsbr_tablegen_common.h | 3 ++-
>  3 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/libavcodec/aacsbr_fixed_tablegen.c b/libavcodec/aacsbr_fixed_tablegen.c
> index b896d75..832fcb7 100644
> --- a/libavcodec/aacsbr_fixed_tablegen.c
> +++ b/libavcodec/aacsbr_fixed_tablegen.c
> @@ -21,9 +21,6 @@
>   */
>
>  #include <stdlib.h>
> -#include "libavutil/internal.h"
> -#include "libavutil/common.h"
> -#undef CONFIG_HARDCODED_TABLES
>  #define CONFIG_HARDCODED_TABLES 0
>  #define USE_FIXED 1
>  #include "aacsbr_fixed_tablegen.h"
> diff --git a/libavcodec/aacsbr_tablegen.c b/libavcodec/aacsbr_tablegen.c
> index ee0d818..c331c57 100644
> --- a/libavcodec/aacsbr_tablegen.c
> +++ b/libavcodec/aacsbr_tablegen.c
> @@ -21,9 +21,6 @@
>   */
>
>  #include <stdlib.h>
> -#include "libavutil/internal.h"
> -#include "libavutil/common.h"
> -#undef CONFIG_HARDCODED_TABLES
>  #define CONFIG_HARDCODED_TABLES 0
>  #define USE_FIXED 0
>  #include "aacsbr_tablegen.h"
> diff --git a/libavcodec/aacsbr_tablegen_common.h b/libavcodec/aacsbr_tablegen_common.h
> index 0a64552..d7fc306 100644
> --- a/libavcodec/aacsbr_tablegen_common.h
> +++ b/libavcodec/aacsbr_tablegen_common.h
> @@ -22,7 +22,8 @@
>
>  #ifndef AVCODEC_AACSBR_TABLEGEN_COMMON_H
>  #define AVCODEC_AACSBR_TABLEGEN_COMMON_H
> -#include "aac.h"
> +#include "aac_defines.h"
> +#include "libavutil/mem.h"
>
>  #if CONFIG_HARDCODED_TABLES
>  #define aacsbr_tableinit()
> --
> 2.6.2.windows.1
>

Last chance for anyone to review, otherwise I'll push it in a day or so.
Was tested using MSVC and GCC using hardcoded tables and runtime tables.