From be100b807eef11ce5de1e51cfd29047d1d93de64 Mon Sep 17 00:00:00 2001 From: Valentin NOEL Date: Mon, 1 Feb 2021 12:48:40 +0100 Subject: [PATCH 1/2] Fix: don't unref and free audio filters data twice --- src/AvTranscoder/transcoder/StreamTranscoder.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp index edf47de3..af92b5d4 100644 --- a/src/AvTranscoder/transcoder/StreamTranscoder.cpp +++ b/src/AvTranscoder/transcoder/StreamTranscoder.cpp @@ -751,6 +751,12 @@ IOutputStream::EWrappingStatus StreamTranscoder::processTranscode() _transformedData->allocateData(); } } + else if(_filterGraph->hasFilters()) + { + LOG_DEBUG("Free filtered data") // filled from filter graph sink + av_frame_unref(&_filteredData->getAVFrame()); + _filteredData->freeData(); + } // Check decoding status bool continueProcess = true; @@ -805,12 +811,6 @@ IOutputStream::EWrappingStatus StreamTranscoder::processTranscode() LOG_DEBUG("Encode") _outputEncoder->encodeFrame(*_transformedData, data); - if(_filterGraph->hasFilters()) - { - LOG_DEBUG("Free filtered data") // filled from filter graph sink - av_frame_unref(&_filteredData->getAVFrame()); - _filteredData->freeData(); - } } else { From d4a39a9d5b9e4679e4ba6a50ea2df70437b82195 Mon Sep 17 00:00:00 2001 From: Valentin NOEL Date: Mon, 1 Feb 2021 14:50:08 +0100 Subject: [PATCH 2/2] Bump version to 0.15.4 --- src/AvTranscoder/common.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp index 4645cce1..5b809c60 100644 --- a/src/AvTranscoder/common.hpp +++ b/src/AvTranscoder/common.hpp @@ -3,7 +3,7 @@ #define AVTRANSCODER_VERSION_MAJOR 0 #define AVTRANSCODER_VERSION_MINOR 15 -#define AVTRANSCODER_VERSION_MICRO 3 +#define AVTRANSCODER_VERSION_MICRO 4 #include