[FFmpeg-soc] [soc]: r3752 - amr/amrdata.h dcaenc/dcaenc.h dirac/libavcodec/dirac.h dirac/libavcodec/dirac_arith.h dirac/libavcodec/dirac_wavelet.h jpeg2000/dwt.h jpeg2000/j2k.h jpeg2000/mqc.h qcelp/qcelpdata.h vc-1/try0/vc1acdata.h vc-1/try0/vc1data.h vc-1/vc1acdata.h

Tue Sep 30 11:51:18 CEST 2008

Author: diego
Date: Tue Sep 30 11:51:18 2008
New Revision: 3752

Log:
Correct multiple inclusion guards for all header files.


Modified:
   amr/amrdata.h
   dcaenc/dcaenc.h
   dirac/libavcodec/dirac.h
   dirac/libavcodec/dirac_arith.h
   dirac/libavcodec/dirac_wavelet.h
   jpeg2000/dwt.h
   jpeg2000/j2k.h
   jpeg2000/mqc.h
   qcelp/qcelpdata.h
   vc-1/try0/vc1acdata.h
   vc-1/try0/vc1data.h
   vc-1/vc1acdata.h

Modified: amr/amrdata.h
==============================================================================

--- amr/amrdata.h	(original)
+++ amr/amrdata.h	Tue Sep 30 11:51:18 2008
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_AMRDATA_H
+#define AVCODEC_AMRDATA_H
 
 /**
  * @file amrdata.h
@@ -1177,3 +1179,5 @@ static const uint16_t pitch_gain_quant[N
 };
 
 /**************************** end of tables *****************************/
+
+#endif /* AVCODEC_AMRDATA_H */

Modified: dcaenc/dcaenc.h
==============================================================================
--- dcaenc/dcaenc.h	(original)
+++ dcaenc/dcaenc.h	Tue Sep 30 11:51:18 2008
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_DCAENC_H
+#define AVCODEC_DCAENC_H
+
 /* This is a scaled version of the response of the reference decoder to
    this vector of subband samples: ( 1.0 0.0 0.0 ... 0.0 )
    */
@@ -537,3 +540,5 @@ static const int32_t UnQMF[512] = {
 5,
 7
 };
+
+#endif /* AVCODEC_DCAENC_H */

Modified: dirac/libavcodec/dirac.h
==============================================================================
--- dirac/libavcodec/dirac.h	(original)
+++ dirac/libavcodec/dirac.h	Tue Sep 30 11:51:18 2008
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_DIRAC_H
+#define AVCODEC_DIRAC_H
+
 /**
  * @file dirac.h
  * Interfaces to Dirac Decoder/Encoder
@@ -587,3 +590,4 @@ void dirac_dump_sequence_parameters(AVCo
 
 void dirac_dump_source_parameters(AVCodecContext *avctx);
 
+#endif /* AVCODEC_DIRAC_H */

Modified: dirac/libavcodec/dirac_arith.h
==============================================================================
--- dirac/libavcodec/dirac_arith.h	(original)
+++ dirac/libavcodec/dirac_arith.h	Tue Sep 30 11:51:18 2008
@@ -122,4 +122,4 @@ void dirac_arith_flush(dirac_arith_state
 
 void dirac_arith_coder_flush(dirac_arith_state_t arith);
 
-#endif // AVCODEC_DIRAC_ARITH_H
+#endif /* AVCODEC_DIRAC_ARITH_H */

Modified: dirac/libavcodec/dirac_wavelet.h
==============================================================================
--- dirac/libavcodec/dirac_wavelet.h	(original)
+++ dirac/libavcodec/dirac_wavelet.h	Tue Sep 30 11:51:18 2008
@@ -44,4 +44,4 @@ int dirac_subband_dwt_53(AVCodecContext 
 int dirac_subband_dwt_95(AVCodecContext *avctx, int width, int height,
                          int padded_width, int16_t *data, int level);
 
-#endif // AVCODEC_DIRACWAVELET_H
+#endif /* AVCODEC_DIRACWAVELET_H */

Modified: jpeg2000/dwt.h
==============================================================================
--- jpeg2000/dwt.h	(original)
+++ jpeg2000/dwt.h	Tue Sep 30 11:51:18 2008
@@ -19,15 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_DWT_H
+#define AVCODEC_DWT_H
+
 /**
  * Discrete wavelet transform
  * @file dwt.h
  * @author Kamil Nowosad
  */
 
-#ifndef DWT_H
-#define DWT_H
-
 #include "avcodec.h"
 
 #define FF_DWT_MAX_DECLVLS 32 ///< max number of decomposition levels
@@ -60,4 +60,4 @@ int ff_dwt_decode(DWTContext *s, int *t)
 
 void ff_dwt_destroy(DWTContext *s);
 
-#endif /* DWT_H */
+#endif /* AVCODEC_DWT_H */

Modified: jpeg2000/j2k.h
==============================================================================
--- jpeg2000/j2k.h	(original)
+++ jpeg2000/j2k.h	Tue Sep 30 11:51:18 2008
@@ -19,15 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_J2K_H
+#define AVCODEC_J2K_H
+
 /**
  * JPEG2000 tables
  * @file j2k.h
  * @author Kamil Nowosad
  */
 
-#ifndef J2K_H
-#define J2K_H
-
 #include "mqc.h"
 #include "dwt.h"
 
@@ -217,4 +217,4 @@ int ff_j2k_init_component(J2kComponent *
 void ff_j2k_reinit(J2kComponent *comp, J2kCodingStyle *codsty);
 void ff_j2k_cleanup(J2kComponent *comp, J2kCodingStyle *codsty);
 
-#endif /* J2K_H */
+#endif /* AVCODEC_J2K_H */

Modified: jpeg2000/mqc.h
==============================================================================
--- jpeg2000/mqc.h	(original)
+++ jpeg2000/mqc.h	Tue Sep 30 11:51:18 2008
@@ -19,15 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_MQC_H
+#define AVCODEC_MQC_H
+
 /**
  * MQ-coder
  * @file mqc.h
  * @author Kamil Nowosad
  */
 
-#ifndef MQC_H
-#define MQC_H
-
 #include "avcodec.h"
 
 #define MQC_CX_UNI 17
@@ -72,4 +72,4 @@ int ff_mqc_decode(MqcState *mqc, uint8_t
 /** initialize the contexts */
 void ff_mqc_init_contexts(MqcState *mqc);
 
-#endif /* MQC_H */
+#endif /* AVCODEC_MQC_H */

Modified: qcelp/qcelpdata.h
==============================================================================
--- qcelp/qcelpdata.h	(original)
+++ qcelp/qcelpdata.h	Tue Sep 30 11:51:18 2008
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_QCELPDATA_H
+#define AVCODEC_QCELPDATA_H
+
 /**
  * @file qcelpdata.h
  * QCELP decoder
@@ -388,3 +391,5 @@ static const double qcelp_rnd_fir_coefs[
   3.041388e-2,-8.210701e-2, 2.434368e-2,-6.905826e-2,
   1.735384e-2,-1.344519e-1
 }; /*!< Start reading from [1]. */
+
+#endif /* AVCODEC_QCELPDATA_H */

Modified: vc-1/try0/vc1acdata.h
==============================================================================
--- vc-1/try0/vc1acdata.h	(original)
+++ vc-1/try0/vc1acdata.h	Tue Sep 30 11:51:18 2008
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_VC1ACDATA_H
+#define AVCODEC_VC1ACDATA_H
+
 #define AC_MODES 8
 
 static const int vc1_ac_sizes[AC_MODES] = {
@@ -583,3 +586,5 @@ static const uint8_t vc1_last_delta_run_
       -1,    30,    28,     3,     0
 }
 };
+
+#endif /* AVCODEC_VC1ACDATA_H */

Modified: vc-1/try0/vc1data.h
==============================================================================
--- vc-1/try0/vc1data.h	(original)
+++ vc-1/try0/vc1data.h	Tue Sep 30 11:51:18 2008
@@ -25,8 +25,8 @@
  * VC-1 tables.
  */
 
-#ifndef VC1DATA_H
-#define VC1DATA_H
+#ifndef AVCODEC_VC1DATA_H
+#define AVCODEC_VC1DATA_H
 
 /* bfraction is fractional, we scale to the GCD 3*5*7*8 = 840 */
 const int16_t vc1_bfraction_lut[23] = {
@@ -573,4 +573,4 @@ static const int32_t vc1_dqscale[63] = {
     0x14E6, 0x147B, 0x1414, 0x13B1, 0x1352, 0x12F7, 0x129E, 0x1249,
     0x11F7, 0x11A8, 0x115B, 0x1111, 0x10C9, 0x1084, 0x1000
 };
-#endif /* VC1DATA_H */
+#endif /* AVCODEC_VC1DATA_H */

Modified: vc-1/vc1acdata.h
==============================================================================
--- vc-1/vc1acdata.h	(original)
+++ vc-1/vc1acdata.h	Tue Sep 30 11:51:18 2008
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_VC1ACDATA_H
+#define AVCODEC_VC1ACDATA_H
+
 #define AC_MODES 8
 
 static const int vc1_ac_sizes[AC_MODES] = {
@@ -583,3 +586,5 @@ static const uint8_t vc1_last_delta_run_
       -1,    30,    28,     3,     0
 }
 };
+
+#endif /* AVCODEC_VC1ACDATA_H */

