From de9e43cd6ad5409283b5f3c165a0780e9f9a8f60 Mon Sep 17 00:00:00 2001
From: JackBurton79 <stefano.ceccherini@gmail.com>
Date: Fri, 24 Aug 2018 09:29:27 +0200
Subject: [PATCH] ffmpeg media decoder: Fix double free() (and possibly #14394.
 Don't call avcodec_close() and then avcodec_free_context(). The latter
 replaces the former.

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ef6dab0a79a9852a92ed80b07f9e32a37530d9e

Change-Id: I346dc8da20a274bcfd901b4a67e612f0f38323b0
---
 src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
index f15c7437f2..c289f59bf1 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_close(fCodecContext);
+		avcodec_free_context(&fCodecContext);
 
 	swr_free(&fResampleContext);
 	free(fChunkBuffer);
@@ -158,7 +158,6 @@ AVCodecDecoder::~AVCodecDecoder()
 	av_free(fRawDecodedPicture);
 	av_free(fRawDecodedAudio->opaque);
 	av_free(fRawDecodedAudio);
-	avcodec_free_context(&fCodecContext);
 	av_free(fDecodedDataBuffer);
 
 	av_frame_free(&fFilterFrame);