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

Merge pull request #577 from mstorsjo/remove-dos-newlines

Browse Source 
Remove accidentally added dos newlines
This commit is contained in:
Licai Guo 2014-03-25 17:04:27 +08:00
commit 8182e31355
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
codec/processing/interface/IWelsVP.h
View File

@ -206,11 +206,11 @@ typedef enum {
GOM_VAR = -2 GOM_VAR = -2
} EComplexityAnalysisMode; } EComplexityAnalysisMode;
typedef struct typedef struct
{ {
int iScrollMvX; int iScrollMvX;
int iScrollMvY; int iScrollMvY;
bool bScrollDetectFlag; // 0:false ; 1:ltr; 2: scene change bool bScrollDetectFlag; // 0:false ; 1:ltr; 2: scene change
} SScrollDetectionResult; } SScrollDetectionResult;
typedef struct { typedef struct {
@ -225,14 +225,14 @@ typedef struct {
SVAACalcResult* pCalcResult; SVAACalcResult* pCalcResult;
} SComplexityAnalysisParam; } SComplexityAnalysisParam;
typedef struct typedef struct
{ {
int iMbRowInGom; int iMbRowInGom;
int *pGomComplexity; int *pGomComplexity;
int iGomNumInFrame; int iGomNumInFrame;
int iFrameComplexity; int iFrameComplexity;
int iIdrFlag; int iIdrFlag;
SScrollDetectionResult sScrollResult; SScrollDetectionResult sScrollResult;
} SComplexityAnalysisScreenParam; } SComplexityAnalysisScreenParam;
///////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////

12
codec/processing/src/common/common.h
View File

@ -53,14 +53,14 @@ typedef int32_t (SadFunc) (uint8_t* pSrcY, int32_t iSrcStrideY, uint8_t* pRefY,
typedef SadFunc* SadFuncPtr; typedef SadFunc* SadFuncPtr;
typedef int32_t (Sad16x16Func) ( uint8_t * pSrcY, int32_t iSrcStrideY, uint8_t *pRefY, int32_t iRefStrideY ); typedef int32_t (Sad16x16Func) ( uint8_t * pSrcY, int32_t iSrcStrideY, uint8_t *pRefY, int32_t iRefStrideY );
typedef Sad16x16Func *PSad16x16Func; typedef Sad16x16Func *PSad16x16Func;
typedef void (GetIntraPred)(uint8_t *pPred, uint8_t *pRef, const int32_t kiStride); typedef void (GetIntraPred)(uint8_t *pPred, uint8_t *pRef, const int32_t kiStride);
typedef GetIntraPred *GetIntraPredPtr; typedef GetIntraPred *GetIntraPredPtr;
GetIntraPred WelsI16x16LumaPredV_c; GetIntraPred WelsI16x16LumaPredV_c;
GetIntraPred WelsI16x16LumaPredH_c; GetIntraPred WelsI16x16LumaPredH_c;