ext/metadata/Makefile.am: Add some relevant variables to CFLAGS and LIBADD, for example our compiler warnings paramters.

Original commit message from CVS:
* ext/metadata/Makefile.am:
Add some relevant variables to CFLAGS and LIBADD, for example our
compiler warnings paramters.
* ext/metadata/gstbasemetadata.c:
(gst_base_metadata_strip_push_buffer),
(gst_base_metadata_calculate_offsets),
(gst_base_metadata_src_event), (gst_base_metadata_sink_activate):
* ext/metadata/gstmetadatademux.c: (gst_metadata_demux_init),
(gst_metadata_demux_set_property), (gst_metadata_demux_dispose):
* ext/metadata/gstmetadatamux.c: (gst_metadata_mux_init),
(gst_metadata_mux_set_property), (gst_metadata_mux_get_property),
(gst_metadata_mux_dispose),
(gst_metadata_mux_create_chunks_from_tags):
* ext/metadata/metadata.c: (metadata_dispose):
* ext/metadata/metadataexif.c:
(metadataparse_exif_content_foreach_entry_func),
(metadatamux_exif_for_each_tag_in_list):
* ext/metadata/metadataiptc.c:
(metadatamux_iptc_for_each_tag_in_list):
* ext/metadata/metadatamuxjpeg.c: (metadatamux_jpeg_lazy_update),
(metadatamux_jpeg_reading):
* ext/metadata/metadatamuxpng.c: (metadatamux_png_reading):
* ext/metadata/metadataparsejpeg.c: (metadataparse_jpeg_reading):
* ext/metadata/metadataparsepng.c:
* ext/metadata/metadataparseutil.h:
* ext/metadata/metadataxmp.c: (metadataparse_xmp_tag_list_add),
(metadatamux_xmp_create_chunk_from_tag_list):
Fix a million warnings that showed up after the above change.

1 files changed, 9 insertions, 3 deletions

diff --git a/ext/metadata/metadataxmp.c b/ext/metadata/metadataxmp.c
index 6226ba8e..d4a58fb4 100644
--- a/ext/metadata/metadataxmp.c
+++ b/ext/metadata/metadataxmp.c
@@ -289,7 +289,7 @@ metadataparse_xmp_tag_list_add (GstTagList * taglist, GstTagMergeMode mode,
 
   buf = gst_adapter_peek (adapter, size);
 
-  xmp = xmp_new (buf, size);
+  xmp = xmp_new ((gchar *) buf, size);
   if (!xmp)
     goto done;
 
@@ -338,7 +338,9 @@ metadatamux_xmp_create_chunk_from_tag_list (guint8 ** buf, guint32 * size,
   if (val) {
     xmp_chunk = gst_value_get_buffer (val);
     if (xmp_chunk)
-      xmp = xmp_new (GST_BUFFER_DATA (xmp_chunk), GST_BUFFER_SIZE (xmp_chunk));
+      xmp =
+          xmp_new ((gchar *) GST_BUFFER_DATA (xmp_chunk),
+          GST_BUFFER_SIZE (xmp_chunk));
   }
 
   if (NULL == xmp)
@@ -825,9 +827,13 @@ metadatamux_xmp_for_each_tag_in_list (const GstTagList * list,
 
         uint32_t options = 0;
 
+#ifdef XMP_1_99_5
+        if (xmp_get_property (xmp, smap->schema, stagmap->xmp_tag,
+                NULL, &options)) {
+#else
         if (xmp_get_property_and_bits (xmp, smap->schema, stagmap->xmp_tag,
                 NULL, &options)) {
-
+#endif
           if (XMP_IS_PROP_SIMPLE (options)) {
 #ifdef XMP_1_99_5
             xmp_set_property (xmp, smap->schema, stagmap->xmp_tag, value, 0);