diff options
Diffstat (limited to 'www/firefox/files/patch-bug1632456')
-rw-r--r-- | www/firefox/files/patch-bug1632456 | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/www/firefox/files/patch-bug1632456 b/www/firefox/files/patch-bug1632456 deleted file mode 100644 index 7822ff438a67..000000000000 --- a/www/firefox/files/patch-bug1632456 +++ /dev/null @@ -1,40 +0,0 @@ -commit 0aaf67da2681 -Author: Martin Stransky <stransky@redhat.com> -Date: Wed May 27 08:37:58 2020 +0000 - - Bug 1632456 [Wayland] Release mVAAPIDeviceContext when FFmpegVideoDecoder::CreateVAAPIDeviceContext() fails, r=jya - - Differential Revision: https://phabricator.services.mozilla.com/D76745 ---- - dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp -index 889d1d1ed5b97..1bd144d7375f4 100644 ---- dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp -+++ dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp -@@ -175,6 +175,10 @@ bool FFmpegVideoDecoder<LIBAV_VER>::CreateVAAPIDeviceContext() { - if (!mVAAPIDeviceContext) { - return false; - } -+ -+ auto releaseVAAPIcontext = -+ MakeScopeExit([&] { mLib->av_buffer_unref(&mVAAPIDeviceContext); }); -+ - AVHWDeviceContext* hwctx = (AVHWDeviceContext*)mVAAPIDeviceContext->data; - AVVAAPIDeviceContext* vactx = (AVVAAPIDeviceContext*)hwctx->hwctx; - -@@ -195,12 +199,12 @@ bool FFmpegVideoDecoder<LIBAV_VER>::CreateVAAPIDeviceContext() { - } - - vactx->display = mDisplay; -- - if (mLib->av_hwdevice_ctx_init(mVAAPIDeviceContext) < 0) { - return false; - } - - mCodecContext->hw_device_ctx = mLib->av_buffer_ref(mVAAPIDeviceContext); -+ releaseVAAPIcontext.release(); - return true; - } - |