[Merge Error Fix] Missing Merge Conflict Resolve.

There were a few missing spots in the previous merge conflict resolve.

Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

diff --git a/gst/tensor_filter/tensor_filter.c b/gst/tensor_filter/tensor_filter.c
index 7af824e..38ba13f 100644 (file)
--- a/gst/tensor_filter/tensor_filter.c
+++ b/gst/tensor_filter/tensor_filter.c
@@ -477,7 +477,7 @@ gst_tensor_filter_set_property (GObject * object, guint prop_id,
       g_assert (filter->prop.customProperties == NULL && value);
       /* Once configures, it cannot be changed in runtime */
       filter->prop.customProperties = g_value_dup_string (value);
-      if (filter->prop.debug == TRUE)
+      if (filter->prop.silent == FALSE)
         g_printerr ("Custom Option = %s\n", filter->prop.customProperties);
       break;
     default:

diff --git a/include/tensor_typedef.h b/include/tensor_typedef.h
index e18c6d6..bb55eee 100644 (file)
--- a/include/tensor_typedef.h
+++ b/include/tensor_typedef.h
@@ -101,7 +101,6 @@ typedef struct _GstTensor_Filter_Framework GstTensor_Filter_Framework;
 typedef struct _GstTensor_Filter_Properties
 {
   gboolean silent; /**< Verbose mode if FALSE */
-  gboolean debug; /**< Print out more thinkgs if TRUE */
   gboolean inputConfigured; /**< TRUE if input dimension is configured */
   gboolean outputConfigured; /** < TRUE if output dimension is configured */
   nnfw_type nnfw; /**< The enum value of corresponding NNFW. _T_F_UNDEFINED if not configured */