From 5e33431d993c9a94ae28fe73923d9a41f47e8207 Mon Sep 17 00:00:00 2001 From: Helge Norberg Date: Tue, 29 Oct 2013 17:26:18 +0100 Subject: [PATCH] Removed incorrect usage of av_interleaved_write_frame (for the version of FFmpeg we use) for flushing frames. It seems like flush support was added later. --- CHANGES.txt | 2 ++ modules/ffmpeg/consumer/ffmpeg_consumer.cpp | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 95b41b373..007394c97 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -12,6 +12,8 @@ General ticking too fast. o FFmpeg: Fixed bug during deinterlace-bob-reinterlace where output fields were offset by one field in relation to input fields. + o FFmpeg: Fixed bug in ffmpeg_consumer where an access violation occurred + during destruction. o Frontend: Only writes elements to casparcg.config which overrides a default value to keep the file as compact as possible. o Version bump to keep up with CasparCG Client version. diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp index 21bc7138b..6bfdcdf74 100644 --- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp +++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp @@ -298,9 +298,6 @@ public: encode_executor_.stop(); encode_executor_.join(); - // Flush - LOG_ON_ERROR2(av_interleaved_write_frame(oc_.get(), nullptr), "[ffmpeg_consumer]"); - LOG_ON_ERROR2(av_write_trailer(oc_.get()), "[ffmpeg_consumer]"); if (!key_only_) -- 2.39.2