From 56a78bfbe848b223431c10de6817852aadb8a96c Mon Sep 17 00:00:00 2001
From: philippegorley <philippe.gorley@savoirfairelinux.com>
Date: Tue, 7 Nov 2017 11:26:20 -0500
Subject: [PATCH] accel: don't crash on fallback
If no accel is found in getFormatCb, accel->codecCtx_ is null, and
segfaults.
Change-Id: Ibe3b246aaa0620f2dd5b91d2864fff65b6e8b794
---
src/media/video/accel.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/media/video/accel.cpp b/src/media/video/accel.cpp
index f14592d329..d91ae52eed 100644
--- a/src/media/video/accel.cpp
+++ b/src/media/video/accel.cpp
@@ -116,8 +116,10 @@ HardwareAccel::fail(bool forceFallback)
fallback_ = true;
allocationFails_ = 0;
extractionFails_ = 0;
- codecCtx_->get_format = avcodec_default_get_format;
- codecCtx_->get_buffer2 = avcodec_default_get_buffer2;
+ if (codecCtx_) {
+ codecCtx_->get_format = avcodec_default_get_format;
+ codecCtx_->get_buffer2 = avcodec_default_get_buffer2;
+ }
}
}
--
GitLab