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

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

Browse Source 
Remove stray dos newlines
This commit is contained in:
Licai Guo
2014-04-08 21:54:20 +08:00
parent 4bdf539ce1 d6cb592e83
commit 8d31783c17
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
codec/processing/src/complexityanalysis/ComplexityAnalysis.h
View File

@@ -80,27 +80,27 @@ class CComplexityAnalysis : public IStrategy {
}; };
//for screen content //for screen content
class CComplexityAnalysisScreen : public IStrategy class CComplexityAnalysisScreen : public IStrategy
{ {
public: public:
CComplexityAnalysisScreen(int32_t cpu_flag); CComplexityAnalysisScreen(int32_t cpu_flag);
~CComplexityAnalysisScreen(); ~CComplexityAnalysisScreen();
EResult Process(int32_t nType, SPixMap *src, SPixMap *ref); EResult Process(int32_t nType, SPixMap *src, SPixMap *ref);
EResult Set(int32_t nType, void *pParam); EResult Set(int32_t nType, void *pParam);
EResult Get(int32_t nType, void *pParam); EResult Get(int32_t nType, void *pParam);
private: private:
void GomComplexityAnalysisIntra( SPixMap *pSrc ); void GomComplexityAnalysisIntra( SPixMap *pSrc );
void GomComplexityAnalysisInter( SPixMap *pSrc, SPixMap *pRef,bool bScrollFlag); void GomComplexityAnalysisInter( SPixMap *pSrc, SPixMap *pRef,bool bScrollFlag);
private: private:
PSad16x16Func m_pSadFunc; PSad16x16Func m_pSadFunc;
GetIntraPredPtr m_pIntraFunc[2]; GetIntraPredPtr m_pIntraFunc[2];
SComplexityAnalysisScreenParam m_ComplexityAnalysisParam; SComplexityAnalysisScreenParam m_ComplexityAnalysisParam;
}; };
WELSVP_NAMESPACE_END WELSVP_NAMESPACE_END