From 58863eca8be5fda029eb2a69c62309290a914d15 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Thu, 15 Oct 2015 18:33:29 -0400
Subject: [PATCH] video mixer: fix bad frame re-use
Some of internal stats of a frame could be re-used by ffmpeg,
but the frame doesn't have been reset for that.
This endings into potential multiple crashes.
This patch forces frame reset before re-use.
Issue: #81689
Change-Id: I9fa1c7e0d7a19d4abc8e44cb8978fa9379d51abf
---
src/media/video/video_mixer.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/media/video/video_mixer.cpp b/src/media/video/video_mixer.cpp
index d09febad9b..0a08feaf81 100644
--- a/src/media/video/video_mixer.cpp
+++ b/src/media/video/video_mixer.cpp
@@ -109,6 +109,8 @@ VideoMixer::update(Observable<std::shared_ptr<VideoFrame>>* ob,
if (x->source == ob) {
if (!x->update_frame)
x->update_frame.reset(new VideoFrame);
+ else
+ x->update_frame->reset();
*x->update_frame = *frame_p;
x->atomic_swap_render(x->update_frame);
return;
--
GitLab