i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg media decoder: Fix double free() (and possibly #14394.

Browse Source 
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
This commit is contained in:
JackBurton79
2018-08-24 09:34:01 +02:00
parent 9b41d53230
commit de9e43cd6a
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
+1 -2
View File
@@ -148,7 +148,7 @@ AVCodecDecoder::~AVCodecDecoder()
#endif #endif
if (fCodecInitDone) if (fCodecInitDone)
avcodec_close(fCodecContext); avcodec_free_context(&fCodecContext);
swr_free(&fResampleContext); swr_free(&fResampleContext);
free(fChunkBuffer); free(fChunkBuffer);
@@ -158,7 +158,6 @@ AVCodecDecoder::~AVCodecDecoder()
av_free(fRawDecodedPicture); av_free(fRawDecodedPicture);
av_free(fRawDecodedAudio->opaque); av_free(fRawDecodedAudio->opaque);
av_free(fRawDecodedAudio); av_free(fRawDecodedAudio);
avcodec_free_context(&fCodecContext);
av_free(fDecodedDataBuffer); av_free(fDecodedDataBuffer);
av_frame_free(&fFilterFrame); av_frame_free(&fFilterFrame);