From 90fb31ac219f7fb5e314686fed03cb069ef81554 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 28 Dec 2020 16:23:04 +0100 Subject: [PATCH] ffmpeg: Fix crash cleaning up audio/video context --- panda/src/ffmpeg/ffmpegAudioCursor.cxx | 2 +- panda/src/ffmpeg/ffmpegVideoCursor.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/panda/src/ffmpeg/ffmpegAudioCursor.cxx b/panda/src/ffmpeg/ffmpegAudioCursor.cxx index c7ee596220..62a20b12ed 100644 --- a/panda/src/ffmpeg/ffmpegAudioCursor.cxx +++ b/panda/src/ffmpeg/ffmpegAudioCursor.cxx @@ -224,7 +224,7 @@ cleanup() { #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 52, 0) avcodec_free_context(&_audio_ctx); #else - delete _audio_ctx; + av_free(_audio_ctx); #endif } _audio_ctx = nullptr; diff --git a/panda/src/ffmpeg/ffmpegVideoCursor.cxx b/panda/src/ffmpeg/ffmpegVideoCursor.cxx index 23314561e9..b6bf441857 100644 --- a/panda/src/ffmpeg/ffmpegVideoCursor.cxx +++ b/panda/src/ffmpeg/ffmpegVideoCursor.cxx @@ -607,7 +607,7 @@ close_stream() { #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 52, 0) avcodec_free_context(&_video_ctx); #else - delete _video_ctx; + av_free(_video_ctx); #endif } _video_ctx = nullptr;