[haiku-commits] haiku: hrev52291 - src/add-ons/media/plugins/ffmpeg

  • From: Stefano Ceccherini <stefano.ceccherini@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 27 Aug 2018 04:10:35 -0400 (EDT)

hrev52291 adds 1 changeset to branch 'master'
old head: 0804aecea1fb57e567198eec647f96b194cb1609
new head: fee62e6a6e6d2f6399f63c3c6decffe8c6e6989c
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=fee62e6a6e6d+%5E0804aecea1fb

----------------------------------------------------------------------------

fee62e6a6e6d: ffmpeg media decoder: revert latest changes to the AVCodecDecoder 
destructor.
  Let's see if it fixes #14394.
  
  Change-Id: Iba3a77197703b43f7c5e29292940b3a9018b4585

                             [ JackBurton79 <stefano.ceccherini@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev52291
Commit:      fee62e6a6e6d2f6399f63c3c6decffe8c6e6989c
URL:         https://git.haiku-os.org/haiku/commit/?id=fee62e6a6e6d
Author:      JackBurton79 <stefano.ceccherini@xxxxxxxxx>
Date:        Mon Aug 27 07:54:12 2018 UTC

Ticket:      https://dev.haiku-os.org/ticket/14394

----------------------------------------------------------------------------

1 file changed, 2 insertions(+), 1 deletion(-)
src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp | 3 ++-

----------------------------------------------------------------------------

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);


Other related posts:

  • » [haiku-commits] haiku: hrev52291 - src/add-ons/media/plugins/ffmpeg - Stefano Ceccherini