RIO-7731: Valgrind error in MP4 AssetInfoLocationAtom DTOR

diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index 80ca767..803c689 100644 (file)
--- a/engines/2way/src/pv_2way_sdkinfo.h
+++ b/engines/2way/src/pv_2way_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PV2WAY_ENGINE_SDKINFO_LABEL "1052164"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1052278"
 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20091029
 
 #endif //PV_2WAY_SDKINFO_H_INCLUDED

diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h
index d728448..9ae83e2 100644 (file)
--- a/engines/author/src/pv_author_sdkinfo.h
+++ b/engines/author/src/pv_author_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1052164"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1052278"
 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20091029
 
 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED

diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h
index f32de3b..10c464d 100644 (file)
--- a/engines/player/src/pv_player_sdkinfo.h
+++ b/engines/player/src/pv_player_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVPLAYER_ENGINE_SDKINFO_LABEL "1052164"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1052278"
 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20091029
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED

diff --git a/fileformats/mp4/parser/src/assetinfoatoms.cpp b/fileformats/mp4/parser/src/assetinfoatoms.cpp
index d7194a6..e86134f 100644 (file)
--- a/fileformats/mp4/parser/src/assetinfoatoms.cpp
+++ b/fileformats/mp4/parser/src/assetinfoatoms.cpp
@@ -758,17 +758,17 @@ AssetInfoLocationAtom::~AssetInfoLocationAtom()
     {
         if (_pLocationStruct->_location_name != NULL)
         {
-            PV_MP4_FF_DELETE(NULL, oscl_wchar, _pLocationStruct->_location_name);
+            PV_MP4_ARRAY_DELETE(NULL, _pLocationStruct->_location_name);
             _pLocationStruct->_location_name = NULL;
         }
         if (_pLocationStruct->_astronomical_body != NULL)
         {
-            PV_MP4_FF_DELETE(NULL, oscl_wchar, _pLocationStruct->_astronomical_body);
+            PV_MP4_ARRAY_DELETE(NULL, _pLocationStruct->_astronomical_body);
             _pLocationStruct->_astronomical_body = NULL;
         }
         if (_pLocationStruct->_additional_notes != NULL)
         {
-            PV_MP4_FF_DELETE(NULL, oscl_wchar, _pLocationStruct->_additional_notes);
+            PV_MP4_ARRAY_DELETE(NULL, _pLocationStruct->_additional_notes);
             _pLocationStruct->_additional_notes = NULL;
         }
     }