shithub: openh264

Info  •  Files  •  Log  •  Branches

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

Remove accidentally added dos newlines

--- a/codec/processing/interface/IWelsVP.h

+++ b/codec/processing/interface/IWelsVP.h

@@ -206,11 +206,11 @@

   GOM_VAR       = -2

 } EComplexityAnalysisMode;

-typedef struct

-{

-  int iScrollMvX;

-  int iScrollMvY;

-  bool bScrollDetectFlag; // 0:false ; 1:ltr; 2: scene change

+typedef struct

+{

+  int iScrollMvX;

+  int iScrollMvY;

+  bool bScrollDetectFlag; // 0:false ; 1:ltr; 2: scene change

 } SScrollDetectionResult;

 typedef struct {

@@ -225,14 +225,14 @@

   SVAACalcResult*  pCalcResult;

 } SComplexityAnalysisParam;

-typedef struct

-{

-  int  iMbRowInGom;

-  int  *pGomComplexity;

-  int  iGomNumInFrame;

-  int  iFrameComplexity;

-  int  iIdrFlag;

-  SScrollDetectionResult sScrollResult;

+typedef struct

+{

+  int  iMbRowInGom;

+  int  *pGomComplexity;

+  int  iGomNumInFrame;

+  int  iFrameComplexity;

+  int  iIdrFlag;

+  SScrollDetectionResult sScrollResult;

 } SComplexityAnalysisScreenParam;

 /////////////////////////////////////////////////////////////////////////////////////////////

--- a/codec/processing/src/common/common.h

+++ b/codec/processing/src/common/common.h

@@ -53,14 +53,14 @@

 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 void (GetIntraPred)(uint8_t *pPred, uint8_t *pRef, const int32_t kiStride);

-

-typedef GetIntraPred  *GetIntraPredPtr;

-

-GetIntraPred     WelsI16x16LumaPredV_c;

+typedef void (GetIntraPred)(uint8_t *pPred, uint8_t *pRef, const int32_t kiStride);

+

+typedef GetIntraPred  *GetIntraPredPtr;

+

+GetIntraPred     WelsI16x16LumaPredV_c;

 GetIntraPred     WelsI16x16LumaPredH_c;