From fee62e6a6e6d2f6399f63c3c6decffe8c6e6989c Mon Sep 17 00:00:00 2001 From: JackBurton79 Date: Mon, 27 Aug 2018 09:54:12 +0200 Subject: [PATCH] ffmpeg media decoder: revert latest changes to the AVCodecDecoder destructor. Let's see if it fixes #14394. Change-Id: Iba3a77197703b43f7c5e29292940b3a9018b4585 --- src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp index c289f59bf1..1c781026c4 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp +++ b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp @@ -148,7 +148,7 @@ AVCodecDecoder::~AVCodecDecoder() #endif if (fCodecInitDone) - avcodec_free_context(&fCodecContext); + avcodec_close(fCodecContext); swr_free(&fResampleContext); free(fChunkBuffer); @@ -158,6 +158,7 @@ AVCodecDecoder::~AVCodecDecoder() av_free(fRawDecodedPicture); av_free(fRawDecodedAudio->opaque); av_free(fRawDecodedAudio); + av_free(fCodecContext); av_free(fDecodedDataBuffer); av_frame_free(&fFilterFrame);