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

Don't use tabs for indentation in multi-line macros

Browse Source 
The astyle configuration makes sure normal code is indented consistently
with 2 spaces, but astyle doesn't seem to touch the indentation in
these multi-line macros.
This commit is contained in:
Martin Storsjö 2015-05-04 10:52:40 +03:00
parent cf33d7031e
commit dd913ef878
9 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
codec/common/inc/macros.h
View File

@ -212,7 +212,7 @@ template<typename T> T WelsClip3(T iX, T iY, T iZ) {
*/ */
#ifndef WELS_VERIFY_RETURN_IFNEQ #ifndef WELS_VERIFY_RETURN_IFNEQ
#define WELS_VERIFY_RETURN_IFNEQ(iResult, iExpected) \ #define WELS_VERIFY_RETURN_IFNEQ(iResult, iExpected) \
if ( iResult != iExpected ){ \ if (iResult != iExpected) { \
return iResult; \ return iResult; \
} }
#endif//#if WELS_VERIFY_RETURN_IF #endif//#if WELS_VERIFY_RETURN_IF
@ -224,7 +224,7 @@ template<typename T> T WelsClip3(T iX, T iY, T iZ) {
*/ */
#ifndef WELS_VERIFY_RETURN_IF #ifndef WELS_VERIFY_RETURN_IF
#define WELS_VERIFY_RETURN_IF(iResult, bCaseIf) \ #define WELS_VERIFY_RETURN_IF(iResult, bCaseIf) \
if ( bCaseIf ){ \ if (bCaseIf) { \
return iResult; \ return iResult; \
} }
#endif//#if WELS_VERIFY_RETURN_IF #endif//#if WELS_VERIFY_RETURN_IF
@ -238,7 +238,7 @@ template<typename T> T WelsClip3(T iX, T iY, T iZ) {
*/ */
#ifndef WELS_VERIFY_RETURN_PROC_IF #ifndef WELS_VERIFY_RETURN_PROC_IF
#define WELS_VERIFY_RETURN_PROC_IF(iResult, bCaseIf, fProc) \ #define WELS_VERIFY_RETURN_PROC_IF(iResult, bCaseIf, fProc) \
if ( bCaseIf ){ \ if (bCaseIf) { \
fProc; \ fProc; \
return iResult; \ return iResult; \
} }

2
codec/decoder/core/inc/dec_golomb.h
View File

@ -63,7 +63,7 @@ namespace WelsDec {
pBufPtr +=2; \ pBufPtr +=2; \
} }
#define NEED_BITS(iCurBits, pBufPtr, iLeftBits, iAllowedBytes, iReadBytes) { \ #define NEED_BITS(iCurBits, pBufPtr, iLeftBits, iAllowedBytes, iReadBytes) { \
if( iLeftBits > 0 ) { \ if (iLeftBits > 0) { \
GET_WORD(iCurBits, pBufPtr, iLeftBits, iAllowedBytes, iReadBytes); \ GET_WORD(iCurBits, pBufPtr, iLeftBits, iAllowedBytes, iReadBytes); \
} \ } \
} }