[Mux] Fix build break during merging asynchronously.
authorMyungJoo Ham <myungjoo.ham@samsung.com>
Thu, 19 Jul 2018 04:56:13 +0000 (13:56 +0900)
committer함명주/동작제어Lab(SR)/Principal Engineer/삼성전자 <myungjoo.ham@samsung.com>
Thu, 19 Jul 2018 05:39:11 +0000 (14:39 +0900)
Resolves conflicts between #300 and #283

Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
gst/tensor_mux/gsttensormux.c

index c4612e8..c159c30 100644 (file)
@@ -336,7 +336,7 @@ gst_push_tensor (GstPad * pad, GstTensorMux * tensor_mux, GstBuffer * buffer,
 
   GstCaps *caps = gst_pad_get_current_caps (pad);
 
-  status = get_tensor_from_padcap (caps, dim, &tensor_type);
+  status = get_tensor_from_padcap (caps, dim, &tensor_type, NULL, NULL);
   g_assert ((status & _TFC_ALL) == _TFC_ALL);
 
   mem = gst_buffer_get_memory (buffer, 0);