From 6ba461a7398a7d42174131dab15f852ef2ae0c24 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 3 Jul 2014 09:37:44 +0200 Subject: [PATCH] Fix patch since openh264 submodule update --- patches/openh264-permissive.patch | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/patches/openh264-permissive.patch b/patches/openh264-permissive.patch index 859db1ee1..bff18b6ce 100644 --- a/patches/openh264-permissive.patch +++ b/patches/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