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 | |
| parent | 93f244e3abc3d75a797535a8da890bb1f9932433 (diff) | |
| parent | 1cd432e167b1a80853760c89a33606e2b5f229c2 (diff) | |
| download | ffmpeg-81ff0c24ef050c1877639ecc3ba6c485fde0a74e.tar.gz | |
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')
| -rw-r--r-- | libavcodec/aac.h | 1 | ||||
| -rw-r--r-- | libavcodec/aac_tablegen.h | 1 | ||||
| -rw-r--r-- | libavcodec/aac_tablegen_decl.h | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h index 1070e5f310..6800067292 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -141,7 +141,6 @@ typedef struct PredictorState { #define SCALE_MAX_POS 255 ///< scalefactor index maximum value #define SCALE_MAX_DIFF 60 ///< maximum scalefactor difference allowed by standard #define SCALE_DIFF_ZERO 60 ///< codebook index corresponding to zero scalefactor indices difference -#define POW_SF2_ZERO 200 ///< ff_aac_pow2sf_tab index corresponding to pow(2, 0); /** * Long Term Prediction 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) diff --git a/libavcodec/aac_tablegen_decl.h b/libavcodec/aac_tablegen_decl.h index 0d86e80bc2..5105dae483 100644 --- a/libavcodec/aac_tablegen_decl.h +++ b/libavcodec/aac_tablegen_decl.h @@ -23,6 +23,8 @@ #ifndef AVCODEC_AAC_TABLEGEN_DECL_H #define AVCODEC_AAC_TABLEGEN_DECL_H +#define POW_SF2_ZERO 200 ///< ff_aac_pow2sf_tab index corresponding to pow(2, 0); + #if CONFIG_HARDCODED_TABLES #define ff_aac_tableinit() extern const float ff_aac_pow2sf_tab[428]; |