shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #830 from ruil2/console_bug

fix a commit bug for console app

--- a/codec/console/enc/src/welsenc.cpp

+++ b/codec/console/enc/src/welsenc.cpp

@@ -634,6 +634,14 @@

   memset (&fs.sRecFileName[0][0], 0, sizeof (fs.sRecFileName));

   FillSpecificParameters (sSvcParam);

+  pSrcPic = new SSourcePicture;

+  if (pSrcPic == NULL) {

+    iRet = 1;

+    goto INSIDE_MEM_FREE;

+  }

+  //fill default pSrcPic

+  pSrcPic->iColorFormat = videoFormatI420;

+  pSrcPic->uiTimeStamp = 0;

   // if configure file exit, reading configure file firstly

   if(bConfigFile){

@@ -652,14 +660,6 @@

       goto INSIDE_MEM_FREE;

     }

   }

-  pSrcPic = new SSourcePicture;

-  if (pSrcPic == NULL) {

-    iRet = 1;

-    goto INSIDE_MEM_FREE;

-  }

-  //fill default pSrcPic

-  pSrcPic->iColorFormat = videoFormatI420;

-  pSrcPic->uiTimeStamp = 0;

   // if configure file exit, reading configure file firstly

   if(bConfigFile){