diff options
| author | Thiago Santos <thiago.sousa.santos@collabora.co.uk> | 2010-03-11 09:29:53 -0300 |
|---|---|---|
| committer | Thiago Santos <thiago.sousa.santos@collabora.co.uk> | 2010-03-11 15:46:21 -0300 |
| commit | c5034a716dc10e9d631d2b447faad2089a432284 (patch) | |
| tree | a65f7e398e0a82298db759eaa9694e89db3352b5 | |
| parent | af5565a62b7f93698617a4e1e42f14ef4c739ad8 (diff) | |
metadata: Remove _XMP_GEO_* tags
Removes GST_TAG_XMP_GEO_LOCATION_COUNTRY,
GST_TAG_XMP_GEO_LOCATION_CITY and
GST_TAG_XMP_GEO_LOCATION_SUBLOCATION from metadata's
private tags as those are now present at -core tags.
Fixes #612410
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ext/metadata/metadatatags.c | 12 | ||||
| -rw-r--r-- | ext/metadata/metadatatags.h | 4 | ||||
| -rw-r--r-- | ext/metadata/metadataxmp.c | 6 |
4 files changed, 4 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 86814f972..6659a53b3 100644 --- a/configure.ac +++ b/configure.ac @@ -50,7 +50,7 @@ AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL dnl *** required versions of GStreamer stuff *** -GST_REQ=0.10.27 +GST_REQ=0.10.28.1 GSTPB_REQ=0.10.27 dnl *** autotools stuff **** diff --git a/ext/metadata/metadatatags.c b/ext/metadata/metadatatags.c index 9d25ef8fe..ba1213308 100644 --- a/ext/metadata/metadatatags.c +++ b/ext/metadata/metadatatags.c @@ -446,17 +446,5 @@ metadata_tags_iptc_register (void) static void metadata_tags_xmp_register (void) { - gst_tag_register (GST_TAG_XMP_GEO_LOCATION_COUNTRY, GST_TAG_FLAG_META, - G_TYPE_STRING, GST_TAG_XMP_GEO_LOCATION_COUNTRY, - "human readable english country name of where the media has been recorded or produced", - NULL); - gst_tag_register (GST_TAG_XMP_GEO_LOCATION_CITY, GST_TAG_FLAG_META, - G_TYPE_STRING, GST_TAG_XMP_GEO_LOCATION_CITY, - "human readable english city name of where the media has been recorded or produced", - NULL); - gst_tag_register (GST_TAG_XMP_GEO_LOCATION_SUBLOCATION, GST_TAG_FLAG_META, - G_TYPE_STRING, GST_TAG_XMP_GEO_LOCATION_SUBLOCATION, - "human readable location detail of where the media has been recorded or produced", - NULL); } diff --git a/ext/metadata/metadatatags.h b/ext/metadata/metadatatags.h index 4d718738b..8500f15aa 100644 --- a/ext/metadata/metadatatags.h +++ b/ext/metadata/metadatatags.h @@ -126,10 +126,6 @@ typedef enum { #define GST_TAG_GPS_SPEED "" #define GST_TAG_GPS_TRACK "" -#define GST_TAG_XMP_GEO_LOCATION_COUNTRY "geo-location-country" -#define GST_TAG_XMP_GEO_LOCATION_CITY "geo-location-city" -#define GST_TAG_XMP_GEO_LOCATION_SUBLOCATION "geo-location-sublocation" - /* *INDENT-ON* */ /* diff --git a/ext/metadata/metadataxmp.c b/ext/metadata/metadataxmp.c index fc9fb4252..98f2f87f9 100644 --- a/ext/metadata/metadataxmp.c +++ b/ext/metadata/metadataxmp.c @@ -168,13 +168,13 @@ static const SchemaTagMap schema_map_dublin_tags_map[] = { }; static const SchemaTagMap schema_map_photoshop_tags_map[] = { - {"Country", GST_TAG_XMP_GEO_LOCATION_COUNTRY }, - {"City", GST_TAG_XMP_GEO_LOCATION_CITY }, + {"Country", GST_TAG_GEO_LOCATION_COUNTRY }, + {"City", GST_TAG_GEO_LOCATION_CITY }, {NULL, NULL} }; static const SchemaTagMap schema_map_iptc4xmpcore_tags_map[] = { - {"location", GST_TAG_XMP_GEO_LOCATION_SUBLOCATION }, + {"location", GST_TAG_GEO_LOCATION_SUBLOCATION }, {NULL, NULL} }; /* *INDENT-ON* */ |