[x265] [PATCH] X265: header guards format Changed to X265_<FILENAME>_H
Gopu Govindaswamy
gopu at multicorewareinc.com
Mon Sep 16 08:53:33 CEST 2013
# HG changeset patch
# User Gopu Govindaswamy <gopu at multicorewareinc.com>
# Date 1379314396 -19800
# Node ID d09f36e4dc8b998a2ca42694fd1ce5cf04421eee
# Parent 6bab41a554b36133865fe3378964cb9e76c24ebd
X265: header guards format Changed to X265_<FILENAME>_H
Globally all the x265 header files header guards format changed into X265_<FILENAME>_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/AccessUnit.h
--- a/source/Lib/TLibCommon/AccessUnit.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/AccessUnit.h Mon Sep 16 12:23:16 2013 +0530
@@ -36,8 +36,8 @@
\brief Access Unit class (header)
*/
-#ifndef _ACCESS_UNIT_
-#define _ACCESS_UNIT_ 1
+#ifndef X265_ACCESSUNIT_H
+#define X265_ACCESSUNIT_H
#include "NAL.h"
#include <list>
@@ -74,4 +74,4 @@
//! \}
-#endif // ifndef _ACCESS_UNIT_
+#endif // ifndef X265_ACCESSUNIT_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/CommonDef.h
--- a/source/Lib/TLibCommon/CommonDef.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/CommonDef.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief Defines constants, macros and tool parameters
*/
-#ifndef __COMMONDEF__
-#define __COMMONDEF__
+#ifndef X265_COMMONDEF_H
+#define X265_COMMONDEF_H
#include <algorithm>
#include <cstdlib>
@@ -172,4 +172,4 @@
//! \}
-#endif // end of #ifndef __COMMONDEF__
+#endif // ifndef X265_COMMONDEF_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/ContextModel.h
--- a/source/Lib/TLibCommon/ContextModel.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/ContextModel.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief context model class (header)
*/
-#ifndef __CONTEXT_MODEL__
-#define __CONTEXT_MODEL__
+#ifndef X265_CONTEXTMODEL_H
+#define X265_CONTEXTMODEL_H
#include "CommonDef.h"
@@ -104,4 +104,4 @@
}
//! \}
-#endif // ifndef __CONTEXT_MODEL__
+#endif // ifndef X265_CONTEXTMODEL_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/ContextModel3DBuffer.h
--- a/source/Lib/TLibCommon/ContextModel3DBuffer.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/ContextModel3DBuffer.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief context model 3D buffer class (header)
*/
-#ifndef _HM_CONTEXT_MODEL_3DBUFFER_H_
-#define _HM_CONTEXT_MODEL_3DBUFFER_H_
+#ifndef X265_CONTEXTMODEL3DBUFFER_H
+#define X265_CONTEXTMODEL3DBUFFER_H
#include <stdio.h>
#include <assert.h>
@@ -106,4 +106,4 @@
}
//! \}
-#endif // _HM_CONTEXT_MODEL_3DBUFFER_H_
+#endif // ifndef X265_CONTEXTMODEL3DBUFFER_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/ContextTables.h
--- a/source/Lib/TLibCommon/ContextTables.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/ContextTables.h Mon Sep 16 12:23:16 2013 +0530
@@ -36,8 +36,8 @@
\todo number of context models is not matched to actual use, should be fixed
*/
-#ifndef __CONTEXTTABLES__
-#define __CONTEXTTABLES__
+#ifndef X265_CONTEXTTABLES_H
+#define X265_CONTEXTTABLES_H
//! \ingroup TLibCommon
//! \{
@@ -320,4 +320,4 @@
}
//! \}
-#endif // ifndef __CONTEXTTABLES__
+#endif // ifndef X265_CONTEXTTABLES_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/NAL.h
--- a/source/Lib/TLibCommon/NAL.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/NAL.h Mon Sep 16 12:23:16 2013 +0530
@@ -31,8 +31,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _NAL_
-#define _NAL_ 1
+#ifndef X265_NAL_H
+#define X265_NAL_H
#include "CommonDef.h"
#include "x265.h"
@@ -118,4 +118,4 @@
}
//! \}
-#endif // ifndef _NAL_
+#endif // ifndef X265_NAL_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/SEI.h
--- a/source/Lib/TLibCommon/SEI.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/SEI.h Mon Sep 16 12:23:16 2013 +0530
@@ -31,8 +31,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _SEI_
-#define _SEI_ 1
+#ifndef X265_SEI_H
+#define X265_SEI_H
#include <list>
#include <vector>
@@ -309,4 +309,4 @@
}
//! \}
-#endif // ifndef _SEI_
+#endif // ifndef X265_SEI_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComBitCounter.h
--- a/source/Lib/TLibCommon/TComBitCounter.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComBitCounter.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief Class for counting bits (header)
*/
-#ifndef __COMBITCOUNTER__
-#define __COMBITCOUNTER__
+#ifndef X265_COMBITCOUNTER_H
+#define X265_COMBITCOUNTER_H
#include "TComBitStream.h"
@@ -72,4 +72,4 @@
}
//! \}
-#endif // ifndef __COMBITCOUNTER__
+#endif // ifndef X265_COMBITCOUNTER_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComBitStream.h
--- a/source/Lib/TLibCommon/TComBitStream.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComBitStream.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief class for handling bitstream (header)
*/
-#ifndef __COMBITSTREAM__
-#define __COMBITSTREAM__
+#ifndef X265_COMBITSTREAM_H
+#define X265_COMBITSTREAM_H
#include <stdint.h>
#include <vector>
@@ -164,4 +164,4 @@
}
//! \}
-#endif // ifndef __COMBITSTREAM__
+#endif // ifndef X265_COMBITSTREAM_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComDataCU.h
--- a/source/Lib/TLibCommon/TComDataCU.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComDataCU.h Mon Sep 16 12:23:16 2013 +0530
@@ -36,8 +36,8 @@
\todo not all entities are documented
*/
-#ifndef _TCOMDATACU_
-#define _TCOMDATACU_
+#ifndef X265_TCOMDATACU_H
+#define X265_TCOMDATACU_H
#include <assert.h>
@@ -628,4 +628,4 @@
}
//! \}
-#endif // ifndef _TCOMDATACU_
+#endif // ifndef X265_TCOMDATACU_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComList.h
--- a/source/Lib/TLibCommon/TComList.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComList.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief general list class (header)
*/
-#ifndef _TCOMLIST_
-#define _TCOMLIST_
+#ifndef X265_TCOMLIST_H
+#define X265_TCOMLIST_H
#include "CommonDef.h"
@@ -114,4 +114,4 @@
}
//! \}
-#endif // ifndef _TCOMLIST_
+#endif // ifndef X265_TCOMLIST_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComLoopFilter.h
--- a/source/Lib/TLibCommon/TComLoopFilter.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComLoopFilter.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief deblocking filter (header)
*/
-#ifndef __TCOMLOOPFILTER__
-#define __TCOMLOOPFILTER__
+#ifndef X265_TCOMLOOPFILTER_H
+#define X265_TCOMLOOPFILTER_H
#include "CommonDef.h"
#include "TComPic.h"
@@ -141,4 +141,4 @@
}
//! \}
-#endif // ifndef __TCOMLOOPFILTER__
+#endif // ifndef X265_TCOMLOOPFILTER_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComMotionInfo.h
--- a/source/Lib/TLibCommon/TComMotionInfo.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComMotionInfo.h Mon Sep 16 12:23:16 2013 +0530
@@ -36,8 +36,8 @@
\todo TComMvField seems to be better to be inherited from MV
*/
-#ifndef __TCOMMOTIONINFO__
-#define __TCOMMOTIONINFO__
+#ifndef X265_TCOMMOTIONINFO_H
+#define X265_TCOMMOTIONINFO_H
#include <memory.h>
#include "CommonDef.h"
@@ -157,4 +157,4 @@
//! \}
-#endif // __TCOMMOTIONINFO__
+#endif // ifndef X265_TCOMMOTIONINFO_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComPattern.h
--- a/source/Lib/TLibCommon/TComPattern.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComPattern.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief neighboring pixel access classes (header)
*/
-#ifndef __TCOMPATTERN__
-#define __TCOMPATTERN__
+#ifndef X265_TCOMPATTERN_H
+#define X265_TCOMPATTERN_H
#include "CommonDef.h"
#include <stdio.h>
@@ -153,4 +153,4 @@
}
//! \}
-#endif // __TCOMPATTERN__
+#endif // ifndef X265_TCOMPATTERN_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComPic.h
--- a/source/Lib/TLibCommon/TComPic.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComPic.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief picture class (header)
*/
-#ifndef __TCOMPIC__
-#define __TCOMPIC__
+#ifndef X265_TCOMPIC_H
+#define X265_TCOMPIC_H
// Include files
#include "CommonDef.h"
@@ -147,4 +147,4 @@
}
//! \}
-#endif // __TCOMPIC__
+#endif // ifndef X265_TCOMPIC_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComPicSym.h
--- a/source/Lib/TLibCommon/TComPicSym.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComPicSym.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief picture symbol class (header)
*/
-#ifndef __TCOMPICSYM__
-#define __TCOMPICSYM__
+#ifndef X265_TCOMPICSYM_H
+#define X265_TCOMPICSYM_H
// Include files
#include "CommonDef.h"
@@ -115,4 +115,4 @@
}
//! \}
-#endif // __TCOMPICSYM__
+#endif // ifndef X265_TCOMPICSYM_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComPicYuv.h
--- a/source/Lib/TLibCommon/TComPicYuv.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComPicYuv.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief picture YUV buffer class (header)
*/
-#ifndef __TCOMPICYUV__
-#define __TCOMPICYUV__
+#ifndef X265_TCOMPICYUV_H
+#define X265_TCOMPICYUV_H
#include "CommonDef.h"
#include "TComRom.h"
@@ -193,4 +193,4 @@
}
//! \}
-#endif // __TCOMPICYUV__
+#endif // ifndef X265_TCOMPICYUV_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComPrediction.h
--- a/source/Lib/TLibCommon/TComPrediction.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComPrediction.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief prediction class (header)
*/
-#ifndef __TCOMPREDICTION__
-#define __TCOMPREDICTION__
+#ifndef X265_TCOMPREDICTION_H
+#define X265_TCOMPREDICTION_H
// Include files
#include "TComPic.h"
@@ -125,4 +125,4 @@
}
//! \}
-#endif // __TCOMPREDICTION__
+#endif // ifndef X265_TCOMPREDICTION_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComRdCost.h
--- a/source/Lib/TLibCommon/TComRdCost.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComRdCost.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief RD cost computation classes (header)
*/
-#ifndef __TCOMRDCOST__
-#define __TCOMRDCOST__
+#ifndef X265_TCOMRDCOST_H
+#define X265_TCOMRDCOST_H
#include "CommonDef.h"
#include <math.h>
@@ -101,4 +101,4 @@
}
//! \}
-#endif // __TCOMRDCOST__
+#endif // ifndef X265_TCOMRDCOST_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComRom.h
--- a/source/Lib/TLibCommon/TComRom.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComRom.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief global variables & functions (header)
*/
-#ifndef __TCOMROM__
-#define __TCOMROM__
+#ifndef X265_TCOMROM_H
+#define X265_TCOMROM_H
#include "CommonDef.h"
@@ -300,4 +300,4 @@
extern const UChar g_renormTable[32];
}
-#endif //__TCOMROM__
+#endif //ifndef X265_TCOMROM_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComSampleAdaptiveOffset.h
--- a/source/Lib/TLibCommon/TComSampleAdaptiveOffset.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComSampleAdaptiveOffset.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief sample adaptive offset class (header)
*/
-#ifndef __TCOMSAMPLEADAPTIVEOFFSET__
-#define __TCOMSAMPLEADAPTIVEOFFSET__
+#ifndef X265_TCOMSAMPLEADAPTIVEOFFSET_H
+#define X265_TCOMSAMPLEADAPTIVEOFFSET_H
#include "CommonDef.h"
#include "TComPic.h"
@@ -223,4 +223,4 @@
}
//! \}
-#endif // ifndef __TCOMSAMPLEADAPTIVEOFFSET__
+#endif // ifndef X265_TCOMSAMPLEADAPTIVEOFFSET_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComSlice.h
--- a/source/Lib/TLibCommon/TComSlice.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComSlice.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief slice header and SPS class (header)
*/
-#ifndef __TCOMSLICE__
-#define __TCOMSLICE__
+#ifndef X265_TCOMSLICE_H
+#define X265_TCOMSLICE_H
#include "CommonDef.h"
#include "TComRom.h"
@@ -1806,4 +1806,4 @@
}
//! \}
-#endif // __TCOMSLICE__
+#endif // ifndef X265_TCOMSLICE_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComTrQuant.h
--- a/source/Lib/TLibCommon/TComTrQuant.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComTrQuant.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief transform and quantization class (header)
*/
-#ifndef __TCOMTRQUANT__
-#define __TCOMTRQUANT__
+#ifndef X265_TCOMTRQUANT_H
+#define X265_TCOMTRQUANT_H
#include "CommonDef.h"
#include "TComYuv.h"
@@ -227,4 +227,4 @@
}
//! \}
-#endif // __TCOMTRQUANT__
+#endif // ifndef X265_TCOMTRQUANT_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComWeightPrediction.h
--- a/source/Lib/TLibCommon/TComWeightPrediction.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComWeightPrediction.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief weighting prediction class (header)
*/
-#ifndef __TCOMWEIGHTPREDICTION__
-#define __TCOMWEIGHTPREDICTION__
+#ifndef X265_TCOMWEIGHTPREDICTION_H
+#define X265_TCOMWEIGHTPREDICTION_H
// Include files
#include "TComPic.h"
@@ -72,4 +72,4 @@
};
}
-#endif // ifndef __TCOMWEIGHTPREDICTION__
+#endif // ifndef X265_TCOMWEIGHTPREDICTION_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TComYuv.h
--- a/source/Lib/TLibCommon/TComYuv.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TComYuv.h Mon Sep 16 12:23:16 2013 +0530
@@ -37,8 +37,8 @@
check usage of removeHighFreq function
*/
-#ifndef __TCOMYUV__
-#define __TCOMYUV__
+#ifndef X265_TCOMYUV_H
+#define X265_TCOMYUV_H
#include "CommonDef.h"
#include "TComRom.h"
@@ -207,4 +207,4 @@
}
//! \}
-#endif // __TCOMYUV__
+#endif // ifndef X265_TCOMYUV_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibCommon/TypeDef.h
--- a/source/Lib/TLibCommon/TypeDef.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibCommon/TypeDef.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief Define basic types, new types and enumerations
*/
-#ifndef _TYPEDEF__
-#define _TYPEDEF__
+#ifndef X265_TYPEDEF_H
+#define X265_TYPEDEF_H
namespace x265 {
// private namespace
@@ -205,4 +205,4 @@
}
//! \}
-#endif // ifndef _TYPEDEF__
+#endif // ifndef X265_TYPEDEF_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/NALwrite.h
--- a/source/Lib/TLibEncoder/NALwrite.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/NALwrite.h Mon Sep 16 12:23:16 2013 +0530
@@ -31,8 +31,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _NAL_WRITE_
-#define _NAL_WRITE_ 1
+#ifndef X265_NALWRITE_H
+#define X265_NALWRITE_H
#include <ostream>
@@ -88,4 +88,4 @@
//! \}
-#endif // ifndef _NAL_WRITE_
+#endif // ifndef X265_NALWRITE_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/SEIwrite.h
--- a/source/Lib/TLibEncoder/SEIwrite.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/SEIwrite.h Mon Sep 16 12:23:16 2013 +0530
@@ -31,8 +31,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _SEI_WRITE_
-#define _SEI_WRITE_
+#ifndef X265_SEIWRITE_H
+#define X265_SEIWRITE_H
#include "SyntaxElementWriter.h"
#include "TLibCommon/SEI.h"
@@ -71,4 +71,4 @@
}
//! \}
-#endif // ifndef _SEI_WRITE_
+#endif // ifndef X265_SEIWRITE_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/SyntaxElementWriter.h
--- a/source/Lib/TLibEncoder/SyntaxElementWriter.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/SyntaxElementWriter.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief CAVLC encoder class (header)
*/
-#ifndef __SYNTAXELEMENTWRITER__
-#define __SYNTAXELEMENTWRITER__
+#ifndef X265_SYNTAXELEMENTWRITER_H
+#define X265_SYNTAXELEMENTWRITER_H
#include "TLibCommon/CommonDef.h"
#include "TLibCommon/TComBitStream.h"
@@ -94,4 +94,4 @@
}
//! \}
-#endif // !defined(__SYNTAXELEMENTWRITER__)
+#endif // ifndef X265_SYNTAXELEMENTWRITER_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/TEncAnalyze.h
--- a/source/Lib/TLibEncoder/TEncAnalyze.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncAnalyze.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief encoder analyzer class (header)
*/
-#ifndef __TENCANALYZE__
-#define __TENCANALYZE__
+#ifndef X265_TENCANALYZE_H
+#define X265_TENCANALYZE_H
#include "TLibCommon/CommonDef.h"
@@ -153,4 +153,4 @@
};
}
-#endif
+#endif // ifndef X265_TENCANALYZE_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/TEncBinCoder.h
--- a/source/Lib/TLibEncoder/TEncBinCoder.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncBinCoder.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief binary entropy encoder interface
*/
-#ifndef __TENC_BIN_CODER__
-#define __TENC_BIN_CODER__
+#ifndef X265_TENCBINCODER_H
+#define X265_TENCBINCODER_H
#include "TLibCommon/ContextModel.h"
#include "TLibCommon/TComBitStream.h"
@@ -80,4 +80,4 @@
}
//! \}
-#endif // ifndef __TENC_BIN_CODER__
+#endif // ifndef X265_TENCBINCODER_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/TEncBinCoderCABAC.h
--- a/source/Lib/TLibEncoder/TEncBinCoderCABAC.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncBinCoderCABAC.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief binary entropy encoder of CABAC
*/
-#ifndef __TENC_BIN_CODER_CABAC__
-#define __TENC_BIN_CODER_CABAC__
+#ifndef X265_TENCBINCODERCABAC_H
+#define X265_TENCBINCODERCABAC_H
#include "TEncBinCoder.h"
@@ -102,4 +102,4 @@
}
//! \}
-#endif // ifndef __TENC_BIN_CODER_CABAC__
+#endif // ifndef X265_TENCBINCODERCABAC_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/TEncBinCoderCABACCounter.h
--- a/source/Lib/TLibEncoder/TEncBinCoderCABACCounter.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncBinCoderCABACCounter.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief binary entropy encoder of CABAC
*/
-#ifndef __TENC_BIN_CODER_CABAC_COUNTER__
-#define __TENC_BIN_CODER_CABAC_COUNTER__
+#ifndef X265_TENCBINCODERCABACCOUNTER_H
+#define X265_TENCBINCODERCABACCOUNTER_H
#include "TEncBinCoderCABAC.h"
@@ -65,4 +65,4 @@
}
//! \}
-#endif // ifndef __TENC_BIN_CODER_CABAC_COUNTER__
+#endif // ifndef X265_TENCBINCODERCABACCOUNTER_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/TEncCavlc.h
--- a/source/Lib/TLibEncoder/TEncCavlc.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncCavlc.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief CAVLC encoder class (header)
*/
-#ifndef __TENCCAVLC__
-#define __TENCCAVLC__
+#ifndef X265_TENCCAVLC_H
+#define X265_TENCCAVLC_H
#include "TLibCommon/CommonDef.h"
#include "TLibCommon/TComBitStream.h"
@@ -158,4 +158,4 @@
}
//! \}
-#endif // !defined(_TENCCAVLC_)
+#endif // ifndef X265_TENCCAVLC_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/TEncCfg.h
--- a/source/Lib/TLibEncoder/TEncCfg.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncCfg.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief encoder configuration class (header)
*/
-#ifndef __TENCCFG__
-#define __TENCCFG__
+#ifndef X265_TENCCFG_H
+#define X265_TENCCFG_H
#include "TLibCommon/CommonDef.h"
#include "TLibCommon/TComSlice.h"
@@ -308,4 +308,4 @@
}
//! \}
-#endif // __TENCCFG__
+#endif // ifndef X265_TENCCFG_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/TEncCu.h
--- a/source/Lib/TLibEncoder/TEncCu.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncCu.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief Coding Unit (CU) encoder class (header)
*/
-#ifndef __TENCCU__
-#define __TENCCU__
+#ifndef X265_TENCCU_H
+#define X265_TENCCU_H
#include "TLibCommon/CommonDef.h"
#include "TLibCommon/TComYuv.h"
@@ -177,4 +177,4 @@
}
//! \}
-#endif // __TENCMB__
+#endif // ifndef X265_TENCCU_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/TEncEntropy.h
--- a/source/Lib/TLibEncoder/TEncEntropy.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncEntropy.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief entropy encoder class (header)
*/
-#ifndef __TENCENTROPY__
-#define __TENCENTROPY__
+#ifndef X265_TENCENTROPY_H
+#define X265_TENCENTROPY_H
#include "TLibCommon/TComSlice.h"
#include "TLibCommon/TComDataCU.h"
@@ -211,4 +211,4 @@
}
//! \}
-#endif // __TENCENTROPY__
+#endif // ifndef X265_TENCENTROPY_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.h
--- a/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.h Mon Sep 16 12:23:16 2013 +0530
@@ -36,8 +36,8 @@
\brief estimation part of sample adaptive offset class (header)
*/
-#ifndef __TENCSAMPLEADAPTIVEOFFSET__
-#define __TENCSAMPLEADAPTIVEOFFSET__
+#ifndef X265_TENCSAMPLEADAPTIVEOFFSET_H
+#define X265_TENCSAMPLEADAPTIVEOFFSET_H
#include "TLibCommon/TComSampleAdaptiveOffset.h"
#include "TLibCommon/TComPic.h"
@@ -122,4 +122,4 @@
}
//! \}
-#endif // ifndef __TENCSAMPLEADAPTIVEOFFSET__
+#endif // ifndef X265_TENCSAMPLEADAPTIVEOFFSET_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/TEncSbac.h
--- a/source/Lib/TLibEncoder/TEncSbac.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncSbac.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief Context-adaptive entropy encoder class (header)
*/
-#ifndef __TENCSBAC__
-#define __TENCSBAC__
+#ifndef X265_TENCSBAC_H
+#define X265_TENCSBAC_H
#include "TLibCommon/TComBitStream.h"
#include "TLibCommon/ContextTables.h"
@@ -216,4 +216,4 @@
}
//! \}
-#endif // !defined(__TENCSBAC__)
+#endif // ifndef X265_TENCSBAC_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/TEncSearch.h
--- a/source/Lib/TLibEncoder/TEncSearch.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncSearch.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief encoder search class (header)
*/
-#ifndef __TENCSEARCH__
-#define __TENCSEARCH__
+#ifndef X265_TENCSEARCH_H
+#define X265_TENCSEARCH_H
// Include files
#include "TLibCommon/TComYuv.h"
@@ -255,4 +255,4 @@
}
//! \}
-#endif // __TENCSEARCH__
+#endif // ifndef X265_TENCSEARCH_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/TEncTop.h
--- a/source/Lib/TLibEncoder/TEncTop.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncTop.h Mon Sep 16 12:23:16 2013 +0530
@@ -35,8 +35,8 @@
\brief encoder class (header)
*/
-#ifndef __TENCTOP__
-#define __TENCTOP__
+#ifndef X265_TENCTOP_H
+#define X265_TENCTOP_H
#include "x265.h"
@@ -118,4 +118,4 @@
}
//! \}
-#endif // __TENCTOP__
+#endif // ifndef X265_TENCTOP_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/Lib/TLibEncoder/WeightPredAnalysis.h
--- a/source/Lib/TLibEncoder/WeightPredAnalysis.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/Lib/TLibEncoder/WeightPredAnalysis.h Mon Sep 16 12:23:16 2013 +0530
@@ -34,8 +34,8 @@
/** \file WeightPredAnalysis.h
\brief weighted prediction encoder class
*/
-#ifndef __WEIGHTPREDANALYSIS__
-#define __WEIGHTPREDANALYSIS__
+#ifndef X265_WEIGHTPREDANALYSIS_H
+#define X265_WEIGHTPREDANALYSIS_H
#include "TLibCommon/TypeDef.h"
#include "TLibCommon/TComSlice.h"
@@ -73,4 +73,4 @@
void xCheckWPEnable(TComSlice *slice);
};
}
-#endif // __WEIGHTPREDANALYSIS__
+#endif // ifndef X265_WEIGHTPREDANALYSIS_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/common/TShortYUV.h
--- a/source/common/TShortYUV.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/common/TShortYUV.h Mon Sep 16 12:23:16 2013 +0530
@@ -23,8 +23,8 @@
* For more information, contact us at licensing at multicorewareinc.com
*****************************************************************************/
-#ifndef __TSHORTYUV__
-#define __TSHORTYUV__
+#ifndef X265_TSHORTYUV_H
+#define X265_TSHORTYUV_H
#include "TLibCommon/TComRom.h"
@@ -111,4 +111,4 @@
};
}
-#endif //end __TSHORTYUV__
+#endif // ifndef X265_TSHORTYUV_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/common/common.h
--- a/source/common/common.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/common/common.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef __COMMON__
-#define __COMMON__
+#ifndef X265_COMMON_H
+#define X265_COMMON_H
#include <cstdlib>
#include "x265.h"
@@ -131,4 +131,4 @@
/* defined in primitives.cpp */
void x265_setup_primitives(x265_param_t *param, int cpuid = 0);
-#endif // ifndef __COMMON__
+#endif // ifndef X265_COMMON_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/common/lowres.h
--- a/source/common/lowres.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/common/lowres.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef _LOOKAHEAD_H
-#define _LOOKAHEAD_H 1
+#ifndef X265_LOWRES_H
+#define X265_LOWRES_H
#include "TLibCommon/TComPicYuv.h"
#include "common.h"
@@ -68,4 +68,4 @@
};
}
-#endif // _LOOKAHEAD_H
+#endif // ifndef X265_LOWRES_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/common/md5.h
--- a/source/common/md5.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/common/md5.h Mon Sep 16 12:23:16 2013 +0530
@@ -22,8 +22,8 @@
* For more information, contact us at chenm003 at 163.com.
*****************************************************************************/
-#ifndef __MD5_H__
-#define __MD5_H__
+#ifndef X265_MD5_H
+#define X265_MD5_H
#include "stdint.h"
@@ -76,4 +76,4 @@
};
}
-#endif /* __MD5_H__ */
+#endif // ifndef X265_MD5_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/common/mv.h
--- a/source/common/mv.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/common/mv.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef __MV__
-#define __MV__
+#ifndef X265_MV_H
+#define X265_MV_H
#include <stdint.h>
@@ -100,4 +100,4 @@
};
}
-#endif // ifndef __MV__
+#endif // ifndef X265_MV_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/common/reference.h
--- a/source/common/reference.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/common/reference.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef __REFERENCE__
-#define __REFERENCE__
+#ifndef X265_REFERENCE_H
+#define X265_REFERENCE_H
#include "primitives.h"
@@ -71,4 +71,4 @@
};
}
-#endif // ifndef __REFERENCE__
+#endif // ifndef X265_REFERENCE_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/common/threading.h
--- a/source/common/threading.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/common/threading.h Mon Sep 16 12:23:16 2013 +0530
@@ -23,8 +23,8 @@
* For more information, contact us at licensing at multicorewareinc.com
*****************************************************************************/
-#ifndef _THREADING_H_
-#define _THREADING_H_
+#ifndef X265_THREADING_H
+#define X265_THREADING_H
#ifdef _WIN32
#include <windows.h>
@@ -315,4 +315,4 @@
#endif // ifdef __GNUC__
-#endif // ifndef _THREADING_H_
+#endif // ifndef X265_THREADING_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/common/threadpool.h
--- a/source/common/threadpool.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/common/threadpool.h Mon Sep 16 12:23:16 2013 +0530
@@ -23,8 +23,8 @@
* For more information, contact us at licensing at multicorewareinc.com
*****************************************************************************/
-#ifndef _THREADPOOL_H_
-#define _THREADPOOL_H_
+#ifndef X265_THREADPOOL_H
+#define X265_THREADPOOL_H
#include <stdint.h>
@@ -106,4 +106,4 @@
};
} // end namespace x265
-#endif // ifndef _THREADPOOL_H_
+#endif // ifndef X265_THREADPOOL_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/common/wavefront.h
--- a/source/common/wavefront.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/common/wavefront.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com
*****************************************************************************/
-#ifndef _WAVEFRONT_H_
-#define _WAVEFRONT_H_
+#ifndef X265_WAVEFRONT_H
+#define X265_WAVEFRONT_H
#include "threadpool.h"
#include <stdint.h>
@@ -79,4 +79,4 @@
};
} // end namespace x265
-#endif // ifndef _WAVEFRONT_H_
+#endif // ifndef X265_WAVEFRONT_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/compat/msvc/getopt.h
--- a/source/compat/msvc/getopt.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/compat/msvc/getopt.h Mon Sep 16 12:23:16 2013 +0530
@@ -16,7 +16,8 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. */
-#ifndef _GETOPT_H
+#ifndef X265_GETOPT_H
+#define X265_GETOPT_H
#ifndef __need_getopt
# define _GETOPT_H 1
@@ -178,4 +179,4 @@
/* Make sure we later can get all the definitions and declarations. */
#undef __need_getopt
-#endif /* getopt.h */
+#endif // ifndef X265_GETOPT_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/encoder/bitcost.h
--- a/source/encoder/bitcost.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/encoder/bitcost.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef __BITCOST__
-#define __BITCOST__
+#ifndef X265_BITCOST_H
+#define X265_BITCOST_H
#include "threading.h"
#include "mv.h"
@@ -82,4 +82,4 @@
};
}
-#endif // ifndef __BITCOST__
+#endif // ifndef X265_BITCOST_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/encoder/cturow.h
--- a/source/encoder/cturow.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/encoder/cturow.h Mon Sep 16 12:23:16 2013 +0530
@@ -22,8 +22,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef __CTUROW__
-#define __CTUROW__
+#ifndef X265_CTUROW_H
+#define X265_CTUROW_H
#include "TLibCommon/TComBitCounter.h"
#include "TLibCommon/TComPic.h"
@@ -78,4 +78,4 @@
}
-#endif // ifndef __CTUROW__
+#endif // ifndef X265_CTUROW_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/encoder/dpb.h
--- a/source/encoder/dpb.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/encoder/dpb.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef __DPB_H__
-#define __DPB_H__
+#ifndef X265_DPB_H
+#define X265_DPB_H
#include "TLibCommon/TComList.h"
@@ -75,4 +75,4 @@
};
}
-#endif // __DPB_H__
+#endif // X265_DPB_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/encoder/frameencoder.h
--- a/source/encoder/frameencoder.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/encoder/frameencoder.h Mon Sep 16 12:23:16 2013 +0530
@@ -22,8 +22,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef __FRAMEENCODER__
-#define __FRAMEENCODER__
+#ifndef X265_FRAMEENCODER_H
+#define X265_FRAMEENCODER_H
#include "TLibCommon/TComBitCounter.h"
#include "TLibCommon/TComPic.h"
@@ -140,4 +140,4 @@
};
}
-#endif // ifndef __FRAMEENCODER__
+#endif // ifndef X265_FRAMEENCODER_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/encoder/framefilter.h
--- a/source/encoder/framefilter.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/encoder/framefilter.h Mon Sep 16 12:23:16 2013 +0530
@@ -22,8 +22,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef __FRAMEFILTER__
-#define __FRAMEFILTER__
+#ifndef X265_FRAMEFILTER_H
+#define X265_FRAMEFILTER_H
#include "TLibCommon/TComPic.h"
#include "TLibCommon/TComLoopFilter.h"
@@ -75,4 +75,4 @@
};
}
-#endif // ifndef __FRAMEFILTER__
+#endif // ifndef X265_FRAMEFILTER_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/encoder/motion.h
--- a/source/encoder/motion.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/encoder/motion.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef __MOTIONESTIMATE__
-#define __MOTIONESTIMATE__
+#ifndef X265_MOTIONESTIMATE_H
+#define X265_MOTIONESTIMATE_H
#include "primitives.h"
#include "reference.h"
@@ -110,4 +110,4 @@
};
}
-#endif // ifndef __MOTIONESTIMATE__
+#endif // ifndef X265_MOTIONESTIMATE_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/encoder/ratecontrol.h
--- a/source/encoder/ratecontrol.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/encoder/ratecontrol.h Mon Sep 16 12:23:16 2013 +0530
@@ -22,8 +22,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef __RATECONTROL__
-#define __RATECONTROL__
+#ifndef X265_RATECONTROL_H
+#define X265_RATECONTROL_H
#include "TLibCommon/CommonDef.h"
@@ -97,4 +97,4 @@
};
}
-#endif // ifndef __RATECONTROL__
+#endif // ifndef X265_RATECONTROL_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/encoder/slicetype.h
--- a/source/encoder/slicetype.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/encoder/slicetype.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef _SLICETYPE_H_
-#define _SLICETYPE_H_ 1
+#ifndef X265_SLICETYPE_H
+#define X265_SLICETYPE_H
#include "TLibCommon/TComList.h"
#include "motion.h"
@@ -73,4 +73,4 @@
};
}
-#endif // ifndef _SLICETYPE_H_
+#endif // ifndef X265_SLICETYPE_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/input/input.h
--- a/source/input/input.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/input/input.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef _INPUT_H_
-#define _INPUT_H_
+#ifndef X265_INPUT_H
+#define X265_INPUT_H
#include "x265.h"
@@ -67,4 +67,4 @@
};
}
-#endif // _INPUT_H_
+#endif // ifndef X265_INPUT_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/input/y4m.h
--- a/source/input/y4m.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/input/y4m.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef _Y4M_H_
-#define _Y4M_H_
+#ifndef X265_Y4M_H
+#define X265_Y4M_H
#include "input.h"
#include <fstream>
@@ -80,4 +80,4 @@
};
}
-#endif // _Y4M_H_
+#endif // ifndef X265_Y4M_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/input/yuv.h
--- a/source/input/yuv.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/input/yuv.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef _YUV_H_
-#define _YUV_H_
+#ifndef X265_YUV_H
+#define X265_YUV_H
#include "input.h"
#include <fstream>
@@ -76,4 +76,4 @@
};
}
-#endif // _YUV_H_
+#endif // ifndef X265_YUV_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/output/output.h
--- a/source/output/output.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/output/output.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef _OUTPUT_H_
-#define _OUTPUT_H_
+#ifndef X265_OUTPUT_H
+#define X265_OUTPUT_H
#include "x265.h"
@@ -49,4 +49,4 @@
};
}
-#endif // _OUTPUT_H_
+#endif // ifndef X265_OUTPUT_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/output/y4m.h
--- a/source/output/y4m.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/output/y4m.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef _Y4M_H_
-#define _Y4M_H_
+#ifndef X265_Y4M_H
+#define X265_Y4M_H
#include "output.h"
#include <fstream>
@@ -60,4 +60,4 @@
};
}
-#endif // _Y4M_H_
+#endif // ifndef X265_Y4M_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/output/yuv.h
--- a/source/output/yuv.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/output/yuv.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef _YUV_H_
-#define _YUV_H_
+#ifndef X265_YUV_H
+#define X265_YUV_H
#include "output.h"
#include <fstream>
@@ -59,4 +59,4 @@
};
}
-#endif // _YUV_H_
+#endif // ifndef X265_YUV_H
diff -r 6bab41a554b3 -r d09f36e4dc8b source/x265.h
--- a/source/x265.h Fri Sep 13 17:24:05 2013 +0530
+++ b/source/x265.h Mon Sep 16 12:23:16 2013 +0530
@@ -21,8 +21,8 @@
* For more information, contact us at licensing at multicorewareinc.com.
*****************************************************************************/
-#ifndef _X265_H_
-#define _X265_H_
+#ifndef X265_X265_H
+#define X265_X265_H
#include <stdint.h>
@@ -348,4 +348,4 @@
}
#endif
-#endif // _X265_H_
+#endif // X265_X265_H
More information about the x265-devel
mailing list