shithub: openh264

Info  •  Files  •  Log  •  Branches

Move a struct to the actual place where it's used

It's not related to the config reader.

--- a/codec/console/enc/inc/read_config.h

+++ b/codec/console/enc/inc/read_config.h

@@ -42,15 +42,7 @@

 #include <stdlib.h>

 #include <string>

-#include "wels_const.h"

 using namespace std;

-

-typedef struct tagFilesSet {

-  string strBsFile;

-  string strSeqFile;	// for cmd lines

-  string strLayerCfgFile[MAX_DEPENDENCY_LAYER];

-  char	 sRecFileName[MAX_DEPENDENCY_LAYER][MAX_FNAME_LEN];

-} SFilesSet;

 class CReadConfig {

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

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

@@ -94,6 +94,13 @@

   SSliceConfig	sSliceCfg;

 } SLayerPEncCtx;

+typedef struct tagFilesSet {

+  string strBsFile;

+  string strSeqFile;    // for cmd lines

+  string strLayerCfgFile[MAX_DEPENDENCY_LAYER];

+  char   sRecFileName[MAX_DEPENDENCY_LAYER][MAX_FNAME_LEN];

+} SFilesSet;

+

 /* Ctrl-C handler */