remove build warning

Change-Id: Ie1fc23cfea6a8a5c61f7f9ea176bb9ffbeed5e61

diff --git a/packaging/gst-plugins-video-enc.spec b/packaging/gst-plugins-video-enc.spec
index 45044bdfb5ee1974e6c95245b4f4cb7b33fbc38d..1bf44acdc79bb9dfe88732c7140af6531c5c3ea5 100644 (file)
--- a/packaging/gst-plugins-video-enc.spec
+++ b/packaging/gst-plugins-video-enc.spec
@@ -1,6 +1,6 @@
 Name:    gst-plugins-video-enc
 Version: 1.0.4
-Release: 0
+Release: 1
 License: LGPL-2.1+
 Summary: nexell video encoder gstreamer plugin
 Group: Development/Libraries

diff --git a/src/gstnxvideoenc.c b/src/gstnxvideoenc.c
index 203b4c2377ae5241ff8a686d1888313b5deec73c..ffa32dcec407f8880848df255b6ad2718d8bff8b 100644 (file)
--- a/src/gstnxvideoenc.c
+++ b/src/gstnxvideoenc.c
@@ -721,8 +721,7 @@ get_encoder_src_caps (GstVideoEncoder * encoder)
     if (src_structure) {
       if (!g_strcmp0 (get_codec_name (nxvideoenc->codec),
               gst_structure_get_name (src_structure))) {
-        src_caps = gst_caps_copy_nth (caps, caps_num);
-        gst_caps_make_writable (src_caps);
+        src_caps = gst_caps_make_writable (gst_caps_copy_nth (caps, caps_num));
         break;
       }
     }
@@ -965,6 +964,7 @@ drm_ioctl (int fd, unsigned long request, void *arg)
   return ret;
 }
 
+#ifndef TIZEN_FEATURE_ARTIK530
 static int
 gem_to_dmafd (int fd, int gem_fd)
 {
@@ -980,30 +980,31 @@ gem_to_dmafd (int fd, int gem_fd)
 }
 
 static int
-gem_close (int fd, int gem_fd)
+import_gem_from_flink (int fd, unsigned int flink_name)
 {
-  struct drm_gem_close arg = { 0, };
+  struct drm_gem_open arg = { 0, };
+  /* struct nx_drm_gem_info info = { 0, }; */
 
-  arg.handle = gem_fd;
-  if (drm_ioctl (fd, DRM_IOCTL_GEM_CLOSE, &arg)) {
+  arg.name = flink_name;
+  if (drm_ioctl (fd, DRM_IOCTL_GEM_OPEN, &arg)) {
     return -EINVAL;
   }
 
-  return 0;
+  return arg.handle;
 }
+#endif
 
 static int
-import_gem_from_flink (int fd, unsigned int flink_name)
+gem_close (int fd, int gem_fd)
 {
-  struct drm_gem_open arg = { 0, };
-  /* struct nx_drm_gem_info info = { 0, }; */
+  struct drm_gem_close arg = { 0, };
 
-  arg.name = flink_name;
-  if (drm_ioctl (fd, DRM_IOCTL_GEM_OPEN, &arg)) {
+  arg.handle = gem_fd;
+  if (drm_ioctl (fd, DRM_IOCTL_GEM_CLOSE, &arg)) {
     return -EINVAL;
   }
 
-  return arg.handle;
+  return 0;
 }
 
 static void
@@ -1086,7 +1087,9 @@ gst_nxvideoenc_handle_frame (GstVideoEncoder * encoder,
   GstVideoFrame inframe;
 
   GstMMVideoBufferMeta *meta = NULL;
+#ifndef TIZEN_FEATURE_ARTIK530
   GstMapInfo in_info;
+#endif
   GstMapInfo out_info;
 
   NX_V4L2ENC_IN encIn;
@@ -1343,7 +1346,7 @@ gst_nxvideoenc_handle_frame (GstVideoEncoder * encoder,
       return GST_FLOW_ERROR;
     }
 #ifdef TIZEN_FEATURE_ARTIK530
-    GstVideoFormatInfo *finfo = inframe.info.finfo;
+    const GstVideoFormatInfo *finfo = inframe.info.finfo;
 #endif
     copy_to_videomemory (&inframe, nxvideoenc->inbuf[nxvideoenc->buf_index]);