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

Fix warnings on OSX compile

Browse Source
This commit is contained in:
Cullen Jennings 2013-12-13 13:03:38 -07:00
parent e83ba4bdde
commit 41d1c31f7f
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec/console/dec/inc/d3d9_utils.h
View File

@ -114,7 +114,7 @@ class CD3D9ExUtils {
}; };
#endif #endif
typedef enum { enum {
OS_UNSUPPORTED = 0, OS_UNSUPPORTED = 0,
OS_XP, OS_XP,
OS_VISTA_UPPER OS_VISTA_UPPER

4
codec/console/dec/src/h264dec.cpp
View File

@ -225,7 +225,7 @@ void_t H264DecodeInstance (ISVCDecoder* pDecoder, const char* kpH264FileName, co
} }
iEnd = WelsTime(); iEnd = WelsTime();
iTotal += iEnd - iStart; iTotal += iEnd - iStart;
if ((sDstBufInfo.iBufferStatus == 1)) { if (sDstBufInfo.iBufferStatus == 1) {
iFrameNum++; iFrameNum++;
cOutputModule.Process ((void_t**)pDst, &sDstBufInfo, pYuvFile); cOutputModule.Process ((void_t**)pDst, &sDstBufInfo, pYuvFile);
if (sDstBufInfo.eBufferProperty == BUFFER_HOST) { if (sDstBufInfo.eBufferProperty == BUFFER_HOST) {
@ -265,7 +265,7 @@ void_t H264DecodeInstance (ISVCDecoder* pDecoder, const char* kpH264FileName, co
pDst[2] = (uint8_t*)pData[2]; pDst[2] = (uint8_t*)pData[2];
} }
if ((sDstBufInfo.iBufferStatus == 1)) { if (sDstBufInfo.iBufferStatus == 1) {
cOutputModule.Process ((void_t**)pDst, &sDstBufInfo, pYuvFile); cOutputModule.Process ((void_t**)pDst, &sDstBufInfo, pYuvFile);
if (sDstBufInfo.eBufferProperty == BUFFER_HOST) { if (sDstBufInfo.eBufferProperty == BUFFER_HOST) {
iWidth = sDstBufInfo.UsrData.sSystemBuffer.iWidth; iWidth = sDstBufInfo.UsrData.sSystemBuffer.iWidth;

2
codec/console/enc/src/welsenc.cpp
View File

@ -970,7 +970,7 @@ int ProcessEncodingSvcWithParam (ISVCEncoder* pPtrEnc, int argc, char** argv) {
long iEncode = pPtrEnc->EncodeFrame (pPlanes[0], &sFbi); long iEncode = pPtrEnc->EncodeFrame (pPlanes[0], &sFbi);
iTotal += WelsTime() - iStart; iTotal += WelsTime() - iStart;
if (videoFrameTypeInvalid == iEncode) { if (videoFrameTypeInvalid == iEncode) {
fprintf (stderr, "EncodeFrame() failed: %d.\n", iEncode); fprintf (stderr, "EncodeFrame() failed: %ld.\n", iEncode);
break; break;
} }

2
codec/decoder/plus/inc/welsDecoderExt.h
View File

@ -77,7 +77,7 @@ virtual long Uninitialize();
* pDstInfo SBufferInfo& information provided to API including width, height, SW/HW option, etc * pDstInfo SBufferInfo& information provided to API including width, height, SW/HW option, etc
* *
* return: if decode frame success return 0, otherwise corresponding error returned. * return: if decode frame success return 0, otherwise corresponding error returned.
/***************************************************************************/ ***************************************************************************/
virtual DECODING_STATE DecodeFrame (const unsigned char* kpSrc, virtual DECODING_STATE DecodeFrame (const unsigned char* kpSrc,
const int kiSrcLen, const int kiSrcLen,
unsigned char** ppDst, unsigned char** ppDst,

4
codec/decoder/plus/src/welsDecoderExt.cpp
View File

@ -82,7 +82,7 @@ namespace WelsDec {
* Input parameters: none * Input parameters: none
* *
* return: none * return: none
/***************************************************************************/ ***************************************************************************/
CWelsDecoder::CWelsDecoder (void_t) CWelsDecoder::CWelsDecoder (void_t)
: m_pDecContext (NULL), : m_pDecContext (NULL),
m_pTrace (NULL) { m_pTrace (NULL) {
@ -146,7 +146,7 @@ CWelsDecoder::CWelsDecoder (void_t)
* Input parameters: none * Input parameters: none
* *
* return: none * return: none
/***************************************************************************/ ***************************************************************************/
CWelsDecoder::~CWelsDecoder() { CWelsDecoder::~CWelsDecoder() {
IWelsTrace::WelsVTrace (m_pTrace, IWelsTrace::WELS_LOG_INFO, "CWelsDecoder::~CWelsDecoder()"); IWelsTrace::WelsVTrace (m_pTrace, IWelsTrace::WELS_LOG_INFO, "CWelsDecoder::~CWelsDecoder()");