shithub: openh264

Download patch

ref: 8d31783c17c002c9e3db219957c65ab96dde1d5c
parent: 4bdf539ce175ba2246352f19dab8f346346a0dd3
parent: d6cb592e83ba8590566d53701f90ad9db92fffb6
author: Licai Guo <licaguo@cisco.com>
date: Tue Apr 8 17:54:20 EDT 2014 

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

Remove stray dos newlines


--- 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