shithub: openh264

Download patch

ref: c21b70f15992b5953fdd0ad9f65a3a6a06436f3e
parent: 2f87e0c90899f4b28440f763680e0566df713446
parent: 973902cf3f9b00c978daf21c93cb36e34cce4fc8
author: ekr <ekr@rtfm.com>
date: Sun Dec 22 22:37:24 EST 2013 

Merge pull request #73 from ruil2/master

typo correction 


--- a/codec/api/svc/codec_app_def.h
+++ b/codec/api/svc/codec_app_def.h
@@ -74,7 +74,7 @@
   ENCODER_OPTION_IDR_INTERVAL,
   ENCODER_OPTION_SVC_ENCODE_PARAM,
   ENCODER_OPTION_FRAME_RATE,
-  ENCODER_OPTION_iBitRate,
+  ENCODER_OPTION_BITRATE,
   ENCODER_OPTION_INTER_SPATIAL_PRED,
   ENCODER_OPTION_RC_MODE,
   ENCODER_PADDING_PADDING,
--- a/codec/encoder/plus/src/welsEncoderExt.cpp
+++ b/codec/encoder/plus/src/welsEncoderExt.cpp
@@ -946,11 +946,11 @@
 
   }
   break;
-  case ENCODER_OPTION_iBitRate: {	// Target bit-rate
+  case ENCODER_OPTION_BITRATE: {	// Target bit-rate
     int32_t iValue = * ((int32_t*)pOption);
 #ifdef REC_FRAME_COUNT
     WelsLog (m_pEncContext, WELS_LOG_INFO,
-             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_iBitRate, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x, iValue= %d\n",
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x, iValue= %d\n",
              m_uiCountFrameNum, m_iCspInternal, iValue);
 #endif//REC_FRAME_COUNT
     m_pEncContext->pSvcParam->iTargetBitrate	= iValue;
@@ -1075,10 +1075,10 @@
     * ((float*)pOption)	= m_pEncContext->pSvcParam->fMaxFrameRate;
   }
   break;
-  case ENCODER_OPTION_iBitRate: {	// Target bit-rate
+  case ENCODER_OPTION_BITRATE: {	// Target bit-rate
 #ifdef REC_FRAME_COUNT
     WelsLog (m_pEncContext, WELS_LOG_INFO,
-             "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_iBitRate, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n",
+             "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_BITRATE, m_uiCountFrameNum= %d, m_iCspInternal= 0x%x\n",
              m_uiCountFrameNum, m_iCspInternal);
 #endif//REC_FRAME_COUNT
     * ((int32_t*)pOption)	= m_pEncContext->pSvcParam->iTargetBitrate;