AP4_Track::GetTrackName fixed after update MPEG4 Splitter (ticket #499)

We now call "Navigate forward" when graph building error appear
Quicktime bitmap lines now aligned
More general VDFastMemcpyPartialSSE2 implantation

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1976 10f7b99b-c216-0410-bff0-8a66a9350fd8

2 files changed, 7 insertions, 7 deletions

diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Track.cpp b/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Track.cpp
index 7748c71a8..9dc915571 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Track.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Track.cpp
@@ -215,7 +215,7 @@ AP4_Track::Clone(AP4_Result* result)
                                      GetDuration(),
                                      GetMediaTimeScale(),
                                      GetMediaDuration(),
-                                     GetTrackLanguage(),
+                                     GetTrackLanguage().GetChars(),
                                      GetWidth(),
                                      GetHeight());
                                      
@@ -449,11 +449,11 @@ AP4_Track::GetMediaDuration()
 /*----------------------------------------------------------------------
 |   AP4_Track::GetTrackName
 +---------------------------------------------------------------------*/
-const char*
+const AP4_String
 AP4_Track::GetTrackName()
 {
     if (AP4_HdlrAtom* hdlr = AP4_DYNAMIC_CAST(AP4_HdlrAtom, m_TrakAtom->FindChild("mdia/hdlr"))) {
-        return hdlr->GetHandlerName().GetChars();
+        return hdlr->GetHandlerName();
     }
     return NULL;
 }
@@ -461,11 +461,11 @@ AP4_Track::GetTrackName()
 /*----------------------------------------------------------------------
 |   AP4_Track::GetTrackLanguage
 +---------------------------------------------------------------------*/
-const char*
+const AP4_String
 AP4_Track::GetTrackLanguage()
 {
     if (AP4_MdhdAtom* mdhd = AP4_DYNAMIC_CAST(AP4_MdhdAtom, m_TrakAtom->FindChild("mdia/mdhd"))) {
-        return mdhd->GetLanguage().GetChars();
+        return mdhd->GetLanguage();
     }
     return NULL;
 }
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Track.h b/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Track.h
index 4c6588e53..12b48560c 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Track.h
+++ b/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4Track.h
@@ -128,8 +128,8 @@ class AP4_Track {
     AP4_UI32      GetMovieTimeScale() { return m_MovieTimeScale; }
     AP4_UI32      GetMediaTimeScale();
     AP4_UI64      GetMediaDuration(); // in the timescale of the media
-    const char*   GetTrackName();
-    const char*   GetTrackLanguage();
+    const AP4_String GetTrackName();
+    const AP4_String GetTrackLanguage();
     AP4_Result    Attach(AP4_MoovAtom* moov);
 
  protected: