commit 6f5237828f69634c7ba7a3260177e7757a8409f0
author Fares Alhassen <falhassen@google.com> Wed Nov 16 17:42:54 2016 -0800
committer sandovad <sandovad@google.com> Tue Sep 03 09:54:59 2019 -0700
tree 8905d7516a3ee9d85e37cafbb2bd8df3ec333733
parent 93c97f0019565c5e36666b5ec58b4e99c099999b

Internal change

PiperOrigin-RevId: 139404155
Change-Id: I02d39a677e18c694aa49505d03e265883930c71b

CHANGES.md

diff --git a/CHANGES.md b/CHANGES.md
index f4da4cf..220c1ef 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,2 +1,3 @@
 cl/139269315 : Several adoptions for std::string and compiler error fixes for
                Android & iOS.
+cl/139403250 : Fix for reading local files.

src/mp4track.cpp

diff --git a/src/mp4track.cpp b/src/mp4track.cpp
index cfa1a1f..fb998eb 100644
--- a/src/mp4track.cpp
+++ b/src/mp4track.cpp
@@ -901,6 +901,7 @@
     if( !pStsdEntryAtom->FindProperty( "*.dataReferenceIndex", (MP4Property**)&pDrefIndexProperty ) ||
         pDrefIndexProperty == NULL )
     {
+        return nullptr;  // Edit by grundman&suril. Fallback to filename.
         throw new Exception( "invalid stsd entry", __FILE__, __LINE__, __FUNCTION__ );
     }