[FFmpeg-devel] [PATCH 03/10] aacenc: Harmonize multiple inclusion guards

Timothy Gu timothygu99 at gmail.com
Sat Aug 22 03:21:36 CEST 2015


---
 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 e2f08b3..47542ae 100644
--- a/libavcodec/aacenc_is.h
+++ b/libavcodec/aacenc_is.h
@@ -25,12 +25,12 @@
  * @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
 
 void ff_aac_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 */
-- 
1.9.1



More information about the ffmpeg-devel mailing list