diff --git a/submodules/build/builders.d/openh264-permissive.patch b/submodules/build/builders.d/openh264-permissive.patch index 859db1ee1..bff18b6ce 100644 --- a/submodules/build/builders.d/openh264-permissive.patch +++ b/submodules/build/builders.d/openh264-permissive.patch @@ -4,19 +4,6 @@ Date: Tue Apr 15 15:19:37 2014 +0200 permissive mode: allow reference frames to be used even if there were lost slices. -diff --git a/codec/decoder/core/src/decoder_core.cpp b/codec/decoder/core/src/decoder_core.cpp -index c19f501..a14e971 100644 ---- a/codec/decoder/core/src/decoder_core.cpp -+++ b/codec/decoder/core/src/decoder_core.cpp -@@ -58,7 +58,7 @@ static inline int32_t DecodeFrameConstruction (PWelsDecoderContext pCtx, uint8_t - WelsLog (pCtx, WELS_LOG_WARNING, - "DecodeFrameConstruction():::iTotalNumMbRec:%d, total_num_mb_sps:%d, cur_layer_mb_width:%d, cur_layer_mb_height:%d --\n", - pCtx->iTotalNumMbRec, kiTotalNumMbInCurLayer, pCurDq->iMbWidth, pCurDq->iMbHeight); -- return -1; -+ //return -1; - } - #ifdef NO_WAITING_AU - pCtx->iTotalNumMbRec = 0; diff --git a/codec/decoder/core/src/manage_dec_ref.cpp b/codec/decoder/core/src/manage_dec_ref.cpp index dcf61ca..5582ec9 100644 --- a/codec/decoder/core/src/manage_dec_ref.cpp diff --git a/submodules/externals/openh264 b/submodules/externals/openh264 index b2f7191fa..bdb7d758c 160000 --- a/submodules/externals/openh264 +++ b/submodules/externals/openh264 @@ -1 +1 @@ -Subproject commit b2f7191fa7e213f5b63b8e31936b962bae6adc2f +Subproject commit bdb7d758c1edce3c42c7fdc203328aae28f08008 diff --git a/submodules/msopenh264 b/submodules/msopenh264 index c871fcf27..ae2270dca 160000 --- a/submodules/msopenh264 +++ b/submodules/msopenh264 @@ -1 +1 @@ -Subproject commit c871fcf27d125fb0a5f3c2f15595f59290b2e047 +Subproject commit ae2270dcaaabb0cc5980783fc5fb6ac5365ee03f