shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #58 from ethanhugg/othercontribs

Rollup of minor fixes found by Martin Ettl

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

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

@@ -905,11 +905,13 @@

   int iParsedNum = 3;

   if (ParseCommandLine (argc - iParsedNum, argv + iParsedNum, sSvcParam) != 0) {

     printf ("parse pCommand line failed\n");

+    fclose(pFpSrc);

     return 1;

   }

   if (cmResultSuccess != pPtrEnc->Initialize (&sSvcParam, INIT_TYPE_PARAMETER_BASED)) {

     fprintf (stderr, "Encoder Initialization failed!\n");

+    fclose(pFpSrc);

     return 1;

   }

--- a/codec/decoder/plus/src/welsDecoderExt.cpp

+++ b/codec/decoder/plus/src/welsDecoderExt.cpp

@@ -480,6 +480,5 @@

 void_t DestroyDecoder (ISVCDecoder* pDecoder) {

   if (NULL != pDecoder) {

     delete (CWelsDecoder*)pDecoder;

-    pDecoder = NULL;

   }

 }

--- a/codec/encoder/core/src/slice_multi_threading.cpp

+++ b/codec/encoder/core/src/slice_multi_threading.cpp

@@ -488,7 +488,7 @@

     err = WelsEventOpen (&pSmt->pReadySliceCodingEvent[iIdx], name);

 #if defined(ENABLE_TRACE_MT)

     WelsLog ((*ppCtx), WELS_LOG_INFO, "[MT] Open pReadySliceCodingEvent%d = 0x%p named(%s) ret%d err%d\n", iIdx,

-             (void*)pSmt->pReadySliceCodingEvent[iIdx]), (void*) (*ppCtx), err, errno);

+             (void*)pSmt->pReadySliceCodingEvent[iIdx], (void*) (*ppCtx), err, errno);

 #endif

 #endif//_WIN32