diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:53:26 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:53:26 +0400 |
| commit | 2dbc93455c148bbd051549a7ed5c88fb08c853c5 (patch) | |
| tree | 41461a4365556582fe991c06ed4624d4767ef05d /libavcodec/aacps_tablegen.h | |
| parent | cccb45751e93142d71be78f6bb90bbfb50ee13be (diff) | |
| parent | 80521c1997a23e148edf89e11b939ab8646297ca (diff) | |
Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'
* commit '80521c1997a23e148edf89e11b939ab8646297ca':
build: allow targets to specify extra objects to link with executables
swscale: avoid pointless use of compound literals
libm: add fallbacks for various single-precision functions
network: use getservbyport() only if available
network: add fallbacks for INADDR_LOOPBACK and INET_ADDRSTRLEN
Include sys/time.h before sys/resource.h
Conflicts:
Makefile
configure
libavutil/libm.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacps_tablegen.h')
| -rw-r--r-- | libavcodec/aacps_tablegen.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/aacps_tablegen.h b/libavcodec/aacps_tablegen.h index a8c4021756..1f9c326d49 100644 --- a/libavcodec/aacps_tablegen.h +++ b/libavcodec/aacps_tablegen.h @@ -31,6 +31,7 @@ #include "libavcodec/aacps_tables.h" #else #include "libavutil/common.h" +#include "libavutil/libm.h" #include "libavutil/mathematics.h" #include "libavutil/mem.h" #define NR_ALLPASS_BANDS20 30 |