mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-31 03:44:15 +00:00
aacenc: Harmonize multiple inclusion guards
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com> Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
This commit is contained in:
parent
15ebc7787c
commit
d4401a9e0d
libavcodec
@ -25,8 +25,8 @@
|
||||
* @author Rostislav Pehlivanov ( atomnuker gmail com )
|
||||
*/
|
||||
|
||||
#ifndef AVCODEC_AACENC_INTENSITY_STEREO_H
|
||||
#define AVCODEC_AACENC_INTENSITY_STEREO_H
|
||||
#ifndef AVCODEC_AACENC_IS_H
|
||||
#define AVCODEC_AACENC_IS_H
|
||||
|
||||
/** Frequency in Hz for lower limit of intensity stereo **/
|
||||
#define INT_STEREO_LOW_LIMIT 6100
|
||||
@ -44,4 +44,4 @@ struct is_error calc_is_encoding_err(AACEncContext *s, ChannelElement *cpe,
|
||||
float ener1, float ener01, int phase);
|
||||
void search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe);
|
||||
|
||||
#endif /* AVCODEC_AACENC_INTENSITY_STEREO_H */
|
||||
#endif /* AVCODEC_AACENC_IS_H */
|
||||
|
@ -25,6 +25,9 @@
|
||||
* @author Rostislav Pehlivanov ( atomnuker gmail com )
|
||||
*/
|
||||
|
||||
#ifndef AVCODEC_AACENC_QUANTIZATION_H
|
||||
#define AVCODEC_AACENC_QUANTIZATION_H
|
||||
|
||||
#include "aactab.h"
|
||||
#include "aacenc.h"
|
||||
#include "aacenctab.h"
|
||||
@ -253,3 +256,5 @@ static inline void quantize_and_encode_band(struct AACEncContext *s, PutBitConte
|
||||
quantize_and_encode_band_cost(s, pb, in, out, NULL, size, scale_idx, cb, lambda,
|
||||
INFINITY, NULL, rtz);
|
||||
}
|
||||
|
||||
#endif /* AVCODEC_AACENC_QUANTIZATION_H */
|
||||
|
Loading…
Reference in New Issue
Block a user