ref: 1d679a8357e8d2389d7dfa683d8a39ef139ed0c5
parent: 5cad8a60c9268a34ec0a658fa7b2cf7c1bdfc9fb
parent: 65616c2c533fba413fffdcdf894b4ce69e29f2ce
author: Ethan Hugg <[email protected]>
date: Tue Jun 10 07:02:43 EDT 2014
Merge pull request #940 from mstorsjo/minor-cleanup Minor cleanups
--- a/codec/decoder/plus/inc/welsDecoderExt.h
+++ b/codec/decoder/plus/inc/welsDecoderExt.h
@@ -39,8 +39,8 @@
*
*
*************************************************************************/
-#if !defined(AFX_WELSH264DECODER_H__D9FAA1D1_5403_47E1_8E27_78F11EE65F02__INCLUDED_)
-#define AFX_WELSH264DECODER_H__D9FAA1D1_5403_47E1_8E27_78F11EE65F02__INCLUDED_
+#if !defined(WELS_PLUS_WELSDECODEREXT_H)
+#define WELS_PLUS_WELSDECODEREXT_H
#include "codec_api.h"
#include "codec_app_def.h"
@@ -113,4 +113,4 @@
} // namespace WelsDec
-#endif // !defined(AFX_WELSH264DECODER_H__D9FAA1D1_5403_47E1_8E27_78F11EE65F02__INCLUDED_)
+#endif // !defined(WELS_PLUS_WELSDECODEREXT_H)
--- a/codec/encoder/core/src/encoder_ext.cpp
+++ b/codec/encoder/core/src/encoder_ext.cpp
@@ -122,7 +122,7 @@
}
if (iTotalBitrate > pCfg->iTargetBitrate) {WelsLog (NULL, WELS_LOG_ERROR,
- "Invalid setttings in bitrate. the sum of each layer bitrate(%d) is larger than total bitrate setting(%d)\n",
+ "Invalid settings in bitrate. the sum of each layer bitrate(%d) is larger than total bitrate setting(%d)\n",
iTotalBitrate, pCfg->iTargetBitrate);
}
}
--- a/codec/encoder/core/src/svc_enc_slice_segment.cpp
+++ b/codec/encoder/core/src/svc_enc_slice_segment.cpp
@@ -118,7 +118,7 @@
}
/*!
- * Check slices assignment setttings on MST_INTERLEAVE type
+ * Check slices assignment settings on MST_INTERLEAVE type
*/
//slice parameter check for SM_FIXEDSLCNUM_SLICE
--- a/codec/encoder/plus/inc/welsEncoderExt.h
+++ b/codec/encoder/plus/inc/welsEncoderExt.h
@@ -29,7 +29,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*
- * welsCodecTrace.h
*
* Abstract
* Cisco OpenH264 encoder extension utilization interface for T26
@@ -39,8 +38,8 @@
*
*
*************************************************************************/
-#if !defined(AFX_WELSH264ENCODER_H__D9FAA1D1_5403_47E1_8E27_78F11EE65F02__INCLUDED_)
-#define AFX_WELSH264ENCODER_H__D9FAA1D1_5403_47E1_8E27_78F11EE65F02__INCLUDED_
+#if !defined(WELS_PLUS_WELSENCODEREXT_H)
+#define WELS_PLUS_WELSENCODEREXT_H
#include "codec_api.h"
#include "codec_def.h"
@@ -130,4 +129,4 @@
void DumpSrcPicture (const uint8_t* pSrc);
};
}
-#endif // !defined(AFX_WELSH264ENCODER_H__D9FAA1D1_5403_47E1_8E27_78F11EE65F02__INCLUDED_)
+#endif // !defined(WELS_PLUS_WELSENCODEREXT_H)