shithub: openh264

Download patch

ref: 616dc87feb637f72b881936e5d55d5ea78f5812a
parent: 90327962c3e874feb866ac0c1d544e4ace680174
parent: 41d1c31f7f06b53563395996985608fd448db8ac
author: Andreas Gal <andreas.gal@gmail.com>
date: Fri Dec 13 09:55:09 EST 2013 

Merge pull request #41 from fluffy/cj1

Fix compile warnings on OSX compile


--- a/codec/console/dec/inc/d3d9_utils.h
+++ b/codec/console/dec/inc/d3d9_utils.h
@@ -114,7 +114,7 @@
 };
 #endif
 
-typedef enum {
+enum {
   OS_UNSUPPORTED = 0,
   OS_XP,
   OS_VISTA_UPPER
--- a/codec/console/dec/src/h264dec.cpp
+++ b/codec/console/dec/src/h264dec.cpp
@@ -225,7 +225,7 @@
     }
     iEnd	= WelsTime();
     iTotal	+= iEnd - iStart;
-    if ((sDstBufInfo.iBufferStatus == 1)) {
+    if (sDstBufInfo.iBufferStatus == 1) {
       iFrameNum++;
       cOutputModule.Process ((void_t**)pDst, &sDstBufInfo, pYuvFile);
       if (sDstBufInfo.eBufferProperty == BUFFER_HOST) {
@@ -265,7 +265,7 @@
     pDst[2] = (uint8_t*)pData[2];
   }
 
-  if ((sDstBufInfo.iBufferStatus == 1)) {
+  if (sDstBufInfo.iBufferStatus == 1) {
     cOutputModule.Process ((void_t**)pDst, &sDstBufInfo, pYuvFile);
     if (sDstBufInfo.eBufferProperty == BUFFER_HOST) {
       iWidth  = sDstBufInfo.UsrData.sSystemBuffer.iWidth;
--- a/codec/console/enc/src/welsenc.cpp
+++ b/codec/console/enc/src/welsenc.cpp
@@ -970,7 +970,7 @@
     long iEncode = pPtrEnc->EncodeFrame (pPlanes[0], &sFbi);
     iTotal += WelsTime() - iStart;
     if (videoFrameTypeInvalid == iEncode) {
-      fprintf (stderr, "EncodeFrame() failed: %d.\n", iEncode);
+      fprintf (stderr, "EncodeFrame() failed: %ld.\n", iEncode);
       break;
     }
 
--- a/codec/decoder/plus/inc/welsDecoderExt.h
+++ b/codec/decoder/plus/inc/welsDecoderExt.h
@@ -77,7 +77,7 @@
 *       pDstInfo        SBufferInfo&           information provided to API including width, height, SW/HW option, etc
 *
 *	return: if decode frame success return 0, otherwise corresponding error returned.
-/***************************************************************************/
+***************************************************************************/
 virtual DECODING_STATE DecodeFrame (const unsigned char* kpSrc,
                                     const int kiSrcLen,
                                     unsigned char** ppDst,
--- a/codec/decoder/plus/src/welsDecoderExt.cpp
+++ b/codec/decoder/plus/src/welsDecoderExt.cpp
@@ -82,7 +82,7 @@
 *	Input parameters: none
 *
 *	return: none
-/***************************************************************************/
+***************************************************************************/
 CWelsDecoder::CWelsDecoder (void_t)
   :	m_pDecContext (NULL),
     m_pTrace (NULL) {
@@ -146,7 +146,7 @@
 *	Input parameters: none
 *
 *	return: none
-/***************************************************************************/
+***************************************************************************/
 CWelsDecoder::~CWelsDecoder() {
   IWelsTrace::WelsVTrace (m_pTrace, IWelsTrace::WELS_LOG_INFO, "CWelsDecoder::~CWelsDecoder()");