shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2972 from mstorsjo/fix-stl

Use a constructor to initialize SFilesSet

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

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

@@ -111,6 +111,13 @@

   char   sRecFileName[MAX_DEPENDENCY_LAYER][MAX_FNAME_LEN];

   uint32_t uiFrameToBeCoded;

   bool     bEnableMultiBsFile;

+

+  tagFilesSet() {

+    uiFrameToBeCoded = 0;

+    bEnableMultiBsFile = false;

+    for (int i = 0; i < MAX_DEPENDENCY_LAYER; i++)

+      sRecFileName[i][0] = '\0';

+  }

 } SFilesSet;

@@ -763,7 +770,7 @@

 #if defined ( STICK_STREAM_SIZE )

   FILE* fTrackStream = fopen ("coding_size.stream", "wb");

 #endif

-  SFilesSet fs = {};

+  SFilesSet fs;

   // for configuration file

   CReadConfig cRdCfg;

   int iParsedNum = 1;

@@ -770,7 +777,6 @@

   memset (&sFbi, 0, sizeof (SFrameBSInfo));

   pPtrEnc->GetDefaultParams (&sSvcParam);

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

   fs.bEnableMultiBsFile = false;

   FillSpecificParameters (sSvcParam);