generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #940 from mstorsjo/minor-cleanup

Browse Source 
Minor cleanups
This commit is contained in:
Ethan Hugg 2014-06-10 11:02:43 -07:00
commit 1d679a8357
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
codec/decoder/plus/inc/welsDecoderExt.h
View File

@ -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 @@ class CWelsDecoder : public ISVCDecoder {
} // namespace WelsDec
#endif // !defined(AFX_WELSH264DECODER_H__D9FAA1D1_5403_47E1_8E27_78F11EE65F02__INCLUDED_)
#endif // !defined(WELS_PLUS_WELSDECODEREXT_H)

2
codec/encoder/core/src/encoder_ext.cpp
View File

@ -122,7 +122,7 @@ int32_t ParamValidation (SWelsSvcCodingParam* pCfg) {
}
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);
}
}

2
codec/encoder/core/src/svc_enc_slice_segment.cpp
View File

@ -118,7 +118,7 @@ int32_t AssignMbMapMultipleSlices (SSliceCtx* pSliceSeg, const SSliceConfig* kpM
}
/*!
* Check slices assignment setttings on MST_INTERLEAVE type
* Check slices assignment settings on MST_INTERLEAVE type
*/
//slice parameter check for SM_FIXEDSLCNUM_SLICE

7
codec/encoder/plus/inc/welsEncoderExt.h
View File

@ -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 @@ class CWelsH264SVCEncoder : public ISVCEncoder {
void DumpSrcPicture (const uint8_t* pSrc);
};
}
#endif // !defined(AFX_WELSH264ENCODER_H__D9FAA1D1_5403_47E1_8E27_78F11EE65F02__INCLUDED_)
#endif // !defined(WELS_PLUS_WELSENCODEREXT_H)