shithub: openh264

Info  •  Files  •  Log  •  Branches

Remove/disable broken code for loading the encoder library from a macos bundle

This refers to a file "bundlewelsenc.h" which doesn't even
exist in the project at the moment.

The corresponding bundle loading code is not called at all
in the decoder console tool.

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

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

@@ -60,11 +60,7 @@

 //#include "layered_pic_buffer.h"

 #include "read_config.h"

-#if defined(MACOS)

-#include "bundlewelsenc.h"

-#else

 #include "typedefs.h"

-#endif//MACOS

 #ifdef _MSC_VER

 #include <io.h>     /* _setmode() */

@@ -1252,22 +1248,13 @@

 long CreateSVCEncHandle (ISVCEncoder** ppEncoder) {

   long ret = 0;

-#if defined(MACOS)

-  ret = WelsEncBundleLoad();

-  WelsEncBundleCreateEncoder (ppEncoder);

-#else

   ret = CreateSVCEncoder (ppEncoder);

-#endif//MACOS

   return ret;

 }

 void DestroySVCEncHandle (ISVCEncoder* pEncoder) {

   if (pEncoder) {

-#if defined(MACOS)

-    WelsEncBundleDestroyEncoder (pEncoder);

-#else

     DestroySVCEncoder (pEncoder);

-#endif//MACOS

   }

 }

@@ -1275,11 +1262,7 @@

 /****************************************************************************

  * main:

  ****************************************************************************/

-#if (defined(MACOS))

-int main_demo (int argc, char** argv)

-#else

 int main (int argc, char** argv)

-#endif

 {

   ISVCEncoder* pSVCEncoder	= NULL;

   FILE* pFileOut					= NULL;