shithub: openh264

Info  •  Files  •  Log  •  Branches

Remove stray dos newlines

These were added in 4ced8a9e and 9645f380.

--- a/codec/encoder/core/src/wels_preprocess.cpp

+++ b/codec/encoder/core/src/wels_preprocess.cpp

@@ -1132,7 +1132,7 @@

 {

   const int32_t iTargetDid = m_pEncCtx->pSvcParam->iSpatialLayerNum - 1;

   SVAAFrameInfoExt* pVaaExt			= static_cast<SVAAFrameInfoExt*> (m_pEncCtx->pVaa);

-  SRefInfoParam* BestRefCandidateParam =&(pVaaExt->sVaaStrBestRefCandidate[iRefIdx]);

+  SRefInfoParam* BestRefCandidateParam =&(pVaaExt->sVaaStrBestRefCandidate[iRefIdx]);

 	int32_t iLtrRefIdx = m_pSpatialPic[iTargetDid][BestRefCandidateParam->iSrcListIdx]->iLongTermPicNum;

   return iLtrRefIdx;

 }

--- a/codec/processing/src/complexityanalysis/ComplexityAnalysis.h

+++ b/codec/processing/src/complexityanalysis/ComplexityAnalysis.h

@@ -80,27 +80,27 @@

 };

-//for screen content

-

-class CComplexityAnalysisScreen : public IStrategy

-{

-public:

-  CComplexityAnalysisScreen(int32_t cpu_flag);

-  ~CComplexityAnalysisScreen();

-

-  EResult Process(int32_t nType, SPixMap *src, SPixMap *ref);

-  EResult Set(int32_t nType, void *pParam);

-  EResult Get(int32_t nType, void *pParam);

-

-private:

-  void GomComplexityAnalysisIntra( SPixMap *pSrc );

-  void GomComplexityAnalysisInter( SPixMap *pSrc, SPixMap *pRef,bool bScrollFlag);

-

-private:

-  PSad16x16Func m_pSadFunc;

-  GetIntraPredPtr m_pIntraFunc[2];

-  SComplexityAnalysisScreenParam m_ComplexityAnalysisParam;

-};

+//for screen content

+

+class CComplexityAnalysisScreen : public IStrategy

+{

+public:

+  CComplexityAnalysisScreen(int32_t cpu_flag);

+  ~CComplexityAnalysisScreen();

+

+  EResult Process(int32_t nType, SPixMap *src, SPixMap *ref);

+  EResult Set(int32_t nType, void *pParam);

+  EResult Get(int32_t nType, void *pParam);

+

+private:

+  void GomComplexityAnalysisIntra( SPixMap *pSrc );

+  void GomComplexityAnalysisInter( SPixMap *pSrc, SPixMap *pRef,bool bScrollFlag);

+

+private:

+  PSad16x16Func m_pSadFunc;

+  GetIntraPredPtr m_pIntraFunc[2];

+  SComplexityAnalysisScreenParam m_ComplexityAnalysisParam;

+};

 WELSVP_NAMESPACE_END