diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:58:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:58:14 +0200 |
| commit | 81ff0c24ef050c1877639ecc3ba6c485fde0a74e (patch) | |
| tree | 862e934366547cb8723d94f7f30953cb20d549b8 /libavcodec/aac_tablegen.h | |
| parent | 93f244e3abc3d75a797535a8da890bb1f9932433 (diff) | |
| parent | 1cd432e167b1a80853760c89a33606e2b5f229c2 (diff) | |
Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'
* commit '1cd432e167b1a80853760c89a33606e2b5f229c2':
configure: fix libcdio check
rtsp: Allow setting the reordering buffer size via an AVOption
rtsp: Vertically align a constant definition
rtp: Update the check for distinguishing between RTP and RTCP
aac: fix build with hardcoded tables
fate: dependencies for screen codec tests
riff: Move functions around to be covered by appropriate #ifdefs
Conflicts:
configure
tests/fate/screen.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aac_tablegen.h')
| -rw-r--r-- | libavcodec/aac_tablegen.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/aac_tablegen.h b/libavcodec/aac_tablegen.h index 7afa466139..2b080ba836 100644 --- a/libavcodec/aac_tablegen.h +++ b/libavcodec/aac_tablegen.h @@ -29,7 +29,6 @@ #include "libavcodec/aac_tables.h" #else #include "libavutil/mathematics.h" -#include "aac.h" float ff_aac_pow2sf_tab[428]; void ff_aac_tableinit(void) |