Removed incorrect usage of av_interleaved_write_frame (for the version of FFmpeg...

diff --git a/CHANGES.txt b/CHANGES.txt
index 95b41b3732a9df5657dd9c86e2ca8ece288e445e..007394c979468e15965a0f6f0ed42674a86e30d8 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,8 @@ General
     ticking too fast.\r
   o FFmpeg: Fixed bug during deinterlace-bob-reinterlace where output fields\r
     were offset by one field in relation to input fields.\r
+  o FFmpeg: Fixed bug in ffmpeg_consumer where an access violation occurred\r
+    during destruction.\r
   o Frontend: Only writes elements to casparcg.config which overrides a default\r
     value to keep the file as compact as possible.\r
   o Version bump to keep up with CasparCG Client version.\r

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index 21bc7138baed1fc3c86f124813c648bb3b822d41..6bfdcdf746425eac5f041d5648ad05c3bf2dc1b9 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -298,9 +298,6 @@ public:
                encode_executor_.stop();\r
                encode_executor_.join();\r
 \r
-               // Flush\r
-               LOG_ON_ERROR2(av_interleaved_write_frame(oc_.get(), nullptr), "[ffmpeg_consumer]");\r
-               \r
                LOG_ON_ERROR2(av_write_trailer(oc_.get()), "[ffmpeg_consumer]");\r
                \r
                if (!key_only_)\r