ffmpeg | branch: master | Timothy Gu <[email protected]> | Sat Aug 22 04:56:36 2015 +0100| [d4401a9e0d667ec7565aafcb61d77e0fd3f06bbc] | committer: Rostislav Pehlivanov
aacenc: Harmonize multiple inclusion guards Signed-off-by: Rostislav Pehlivanov <[email protected]> Reviewed-by: Ganesh Ajjanagadde <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d4401a9e0d667ec7565aafcb61d77e0fd3f06bbc --- libavcodec/aacenc_is.h | 6 +++--- libavcodec/aacenc_quantization.h | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libavcodec/aacenc_is.h b/libavcodec/aacenc_is.h index abb9b32..55f5d68 100644 --- a/libavcodec/aacenc_is.h +++ b/libavcodec/aacenc_is.h @@ -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 */ diff --git a/libavcodec/aacenc_quantization.h b/libavcodec/aacenc_quantization.h index a967622..64093b8 100644 --- a/libavcodec/aacenc_quantization.h +++ b/libavcodec/aacenc_quantization.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 */ _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
