pnmenc: Fix string memory leak / add nettle for hls

Change-Id: I7d6cd1ca104ca244fb0c1fc7086a221b6c804a80

diff --git a/gst/pnm/gstpnmenc.c b/gst/pnm/gstpnmenc.c
index 8a0461c..36a1e0a 100644 (file)
--- a/gst/pnm/gstpnmenc.c
+++ b/gst/pnm/gstpnmenc.c
@@ -174,7 +174,12 @@ gst_pnmenc_handle_frame (GstVideoEncoder * encoder, GstVideoCodecFrame * frame)
   GstPnmenc *pnmenc;
   guint size, pixels;
   GstMapInfo omap, imap;
+#ifdef TIZEN_FEATURE_UPSTREAM
+  gchar *header = NULL;
+#else
   gchar *header;
+#endif
+
   GstVideoInfo *info;
   GstFlowReturn ret = GST_FLOW_OK;
   guint i_rowstride, o_rowstride;
@@ -284,6 +289,9 @@ gst_pnmenc_handle_frame (GstVideoEncoder * encoder, GstVideoCodecFrame * frame)
     goto done;
 
 done:
+#ifdef TIZEN_FEATURE_UPSTREAM
+  g_free (header);
+#endif
   return ret;
 }
 

diff --git a/packaging/gst-plugins-bad.spec b/packaging/gst-plugins-bad.spec
index 7ba7e46..e8f5c2c 100644 (file)
--- a/packaging/gst-plugins-bad.spec
+++ b/packaging/gst-plugins-bad.spec
@@ -32,6 +32,7 @@ BuildRequires:  pkgconfig(sndfile) >= 1.0.16
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libtbm)
 BuildRequires: pkgconfig(mm-common)
+BuildRequires:  pkgconfig(nettle)
 #BuildRequires:  mesa-libGLESv2
 #BuildRequires:  mesa-libEGL
 %if %{with wayland}
@@ -78,7 +79,7 @@ processing capabilities can be added simply by installing new plug-ins.
 %build
 export V=1
 NOCONFIGURE=1 ./autogen.sh
-export CFLAGS+=" -Wall -g -fPIC -DTIZEN_FEATURE_WLSINK_ENHANCEMENT -DTIZEN_FEATURE_AVOID_PAD_SWITCHING -DTIZEN_FEATURE_ADAPTIVE_MODIFICATION -DTIZEN_FEATURE_TSDEMUX_MODIFICATION"
+export CFLAGS+=" -Wall -g -fPIC -DTIZEN_FEATURE_WLSINK_ENHANCEMENT -DTIZEN_FEATURE_AVOID_PAD_SWITCHING -DTIZEN_FEATURE_ADAPTIVE_MODIFICATION -DTIZEN_FEATURE_TSDEMUX_MODIFICATION -DTIZEN_FEATURE_UPSTREAM"
 %configure\
        --disable-static\
        --disable-examples\