From: PacketVideo CM <engbuild@pv.com>
Date: Wed, 21 Oct 2009 16:46:40 +0000 (-0700)
Subject: RIO-7703: Fix for memory leak in mp4 local playback at GetMetaDataValue
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d4d8206a40a17613cca63de0e15a9c098a0d908a;p=android-x86%2Fexternal-opencore.git

RIO-7703: Fix for memory leak in mp4 local playback at GetMetaDataValue
---

diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index 23214aed..85ddf4ee 100644
--- 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 "1023559"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1023577"
 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20091015
 
 #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 60ba69b0..38fb84b7 100644
--- 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 "1023559"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1023577"
 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20091015
 
 #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 0c9c42a1..fdcfe8be 100644
--- 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 "1023559"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1023577"
 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20091015
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED
diff --git a/nodes/pvmp4ffparsernode/src/pvmf_mp4ffparser_node_metadata.cpp b/nodes/pvmp4ffparsernode/src/pvmf_mp4ffparser_node_metadata.cpp
index b0442e2f..d8da1323 100644
--- a/nodes/pvmp4ffparsernode/src/pvmf_mp4ffparser_node_metadata.cpp
+++ b/nodes/pvmp4ffparsernode/src/pvmf_mp4ffparser_node_metadata.cpp
@@ -457,7 +457,7 @@ PVMFStatus PVMFMP4FFParserNode::DoGetMetadataValues(PVMFMP4FFParserNodeCommand&
                         // Check if the max number of value entries were added
                         if (max_entries > 0 && numentriesadded >= max_entries)
                         {
-
+                            iMP4ParserNodeMetadataValueCount = (*valuelistptr).size();
                             return PVMFSuccess;
                         }
                     }
@@ -628,7 +628,7 @@ PVMFStatus PVMFMP4FFParserNode::DoGetMetadataValues(PVMFMP4FFParserNodeCommand&
                             // Check if the max number of value entries were added
                             if (max_entries > 0 && numentriesadded >= max_entries)
                             {
-
+                                iMP4ParserNodeMetadataValueCount = (*valuelistptr).size();
                                 return PVMFSuccess;
                             }
                         }
@@ -705,7 +705,7 @@ PVMFStatus PVMFMP4FFParserNode::DoGetMetadataValues(PVMFMP4FFParserNodeCommand&
                             // Check if the max number of value entries were added
                             if (max_entries > 0 && numentriesadded >= max_entries)
                             {
-
+                                iMP4ParserNodeMetadataValueCount = (*valuelistptr).size();
                                 return PVMFSuccess;
                             }
                         }
@@ -782,7 +782,7 @@ PVMFStatus PVMFMP4FFParserNode::DoGetMetadataValues(PVMFMP4FFParserNodeCommand&
                             // Check if the max number of value entries were added
                             if (max_entries > 0 && numentriesadded >= max_entries)
                             {
-
+                                iMP4ParserNodeMetadataValueCount = (*valuelistptr).size();
                                 return PVMFSuccess;
                             }
                         }
@@ -857,7 +857,7 @@ PVMFStatus PVMFMP4FFParserNode::DoGetMetadataValues(PVMFMP4FFParserNodeCommand&
                             // Check if the max number of value entries were added
                             if (max_entries > 0 && numentriesadded >= max_entries)
                             {
-
+                                iMP4ParserNodeMetadataValueCount = (*valuelistptr).size();
                                 return PVMFSuccess;
                             }
                         }
@@ -932,7 +932,7 @@ PVMFStatus PVMFMP4FFParserNode::DoGetMetadataValues(PVMFMP4FFParserNodeCommand&
                             // Check if the max number of value entries were added
                             if (max_entries > 0 && numentriesadded >= max_entries)
                             {
-
+                                iMP4ParserNodeMetadataValueCount = (*valuelistptr).size();
                                 return PVMFSuccess;
                             }
                         }