From 121d88ee663ab3dffdcbc207135137c3fb0c8ef9 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 8 Jun 2017 23:42:48 -0700
Subject: [PATCH] Fix goto bypassing variable initialization
Though it's a pointer.
Task-number: QTBUG-60464
Change-Id: Ia3e896da908f42939148fffd14c660fd8da43aa2
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
---
src/plugins/directshow/player/directshowmetadatacontrol.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
index 1f75e3340..84f990830 100644
--- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp
+++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
@@ -624,9 +624,7 @@ void DirectShowMetaDataControl::updateMetadata(IFilterGraph2 *graph, IBaseFilter
#endif
#if QT_CONFIG(wmsdk)
- IWMHeaderInfo *info = com_cast<IWMHeaderInfo>(source, IID_IWMHeaderInfo);
-
- if (info) {
+ if (IWMHeaderInfo *info = com_cast<IWMHeaderInfo>(source, IID_IWMHeaderInfo)) {
const auto keys = *qt_wmMetaDataKeys();
for (const QWMMetaDataKey &key : keys) {
QVariant var = getValue(info, key.wmName);
--
GitLab