History

Remove useless ifdefs

This is in practice always enabled on all currently supported platforms.

Martin Storsjö committed 12 years ago

Commit 647fff61 parent bbb6ffd3 files · +0 −16Browse files

Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 3 files). Show all

Unified · Split

codec/encoder/plus/src/welsEncoderExt.cpp+0−6
@@ -60,9 +60,7 @@ namespace WelsSVCEnc { · 59 unmodified lines
60 */60 */
61CWelsH264SVCEncoder::CWelsH264SVCEncoder()61CWelsH264SVCEncoder::CWelsH264SVCEncoder()
62 : m_pEncContext (NULL),62 : m_pEncContext (NULL),
63#if defined(_WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__)
64 m_pWelsTrace (NULL),63 m_pWelsTrace (NULL),
65#endif
66 m_pSrcPicList (NULL),64 m_pSrcPicList (NULL),
67 m_iSrcListSize (0),65 m_iSrcListSize (0),
68 m_iMaxPicWidth (0),66 m_iMaxPicWidth (0),
@@ -145,13 +143,11 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 76 unmodified lines
145 143
146CWelsH264SVCEncoder::~CWelsH264SVCEncoder() {144CWelsH264SVCEncoder::~CWelsH264SVCEncoder() {
147 WelsLog (NULL, WELS_LOG_INFO, "CWelsH264SVCEncoder::~CWelsH264SVCEncoder()\n");145 WelsLog (NULL, WELS_LOG_INFO, "CWelsH264SVCEncoder::~CWelsH264SVCEncoder()\n");
148#if defined(_WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__)
149 146
150 if (m_pWelsTrace != NULL) {147 if (m_pWelsTrace != NULL) {
151 delete m_pWelsTrace;148 delete m_pWelsTrace;
152 m_pWelsTrace = NULL;149 m_pWelsTrace = NULL;
153 }150 }
154#endif
155#ifdef REC_FRAME_COUNT151#ifdef REC_FRAME_COUNT
156 WelsLog (m_pEncContext, WELS_LOG_INFO,152 WelsLog (m_pEncContext, WELS_LOG_INFO,
157 "CWelsH264SVCEncoder::~CWelsH264SVCEncoder(), m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n", m_uiCountFrameNum,153 "CWelsH264SVCEncoder::~CWelsH264SVCEncoder(), m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n", m_uiCountFrameNum,
@@ -180,7 +176,6 @@ CWelsH264SVCEncoder::~CWelsH264SVCEncoder() { · 22 unmodified lines
180}176}
181 177
182void CWelsH264SVCEncoder::InitEncoder (void) {178void CWelsH264SVCEncoder::InitEncoder (void) {
183#if defined(_WIN32)||defined(_MACH_PLATFORM)||defined(__GNUC__)
184 179
185#ifdef REC_FRAME_COUNT180#ifdef REC_FRAME_COUNT
186 WelsLog (m_pEncContext, WELS_LOG_INFO,181 WelsLog (m_pEncContext, WELS_LOG_INFO,
@@ -198,7 +193,6 @@ void CWelsH264SVCEncoder::InitEncoder (void) { · 11 unmodified lines
198 193
199 // initialization194 // initialization
200 WelsSetLogLevel (WELS_LOG_DEFAULT); // no output, WELS_LOG_QUIET195 WelsSetLogLevel (WELS_LOG_DEFAULT); // no output, WELS_LOG_QUIET
201#endif
202}196}
203 197
204/* Interfaces override from ISVCEncoder */198/* Interfaces override from ISVCEncoder */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t