projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5efe994
)
msdk: fix the wrong operator
author
Xiang, Haihao
<haihao.xiang@intel.com>
Wed, 28 Nov 2018 03:15:28 +0000
(11:15 +0800)
committer
Víctor Manuel Jáquez Leal
<vjaquez@igalia.com>
Mon, 3 Dec 2018 07:09:56 +0000
(07:09 +0000)
The condition is for video memory only, so the operator should be
& instead of |
sys/msdk/gstmsdkbufferpool.c
patch
|
blob
|
history
diff --git
a/sys/msdk/gstmsdkbufferpool.c
b/sys/msdk/gstmsdkbufferpool.c
index
a18b965
..
41a8e67
100644
(file)
--- a/
sys/msdk/gstmsdkbufferpool.c
+++ b/
sys/msdk/gstmsdkbufferpool.c
@@
-125,7
+125,7
@@
gst_msdk_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
GST_BUFFER_POOL_OPTION_MSDK_USE_VIDEO_MEMORY))
priv->memory_type = GST_MSDK_MEMORY_TYPE_VIDEO;
- if ((priv->memory_type
|
GST_MSDK_MEMORY_TYPE_VIDEO) && (!priv->context
+ if ((priv->memory_type
&
GST_MSDK_MEMORY_TYPE_VIDEO) && (!priv->context
|| !priv->alloc_response)) {
GST_ERROR_OBJECT (pool,
"No MSDK context or Allocation response for using video memory");