mozilla-central: changeset 235781:ecd90a83bb4a5c0efe96e6cae625f1c74bdaa276

author	Matt Woodrow <mwoodrow@mozilla.com>
	Thu, 26 Mar 2015 12:57:58 +1300
changeset 235781	ecd90a83bb4a5c0efe96e6cae625f1c74bdaa276
parent 235780	4f8721033f5b1c42f4b649589bb171f129eddc79
child 235782	2118109cc0e222c3475d868252eab0ac32751f9f
push id	28482
push user	ryanvm@gmail.com
push date	Thu, 26 Mar 2015 18:44:19 +0000
treeherder	mozilla-central@d5a537c7c558 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	ajones
bugs	1145037
milestone	39.0a1
first release with	nightly linux32 e046475a75cb / 39.0a1 / 20150327030212 / files nightly linux64 e046475a75cb / 39.0a1 / 20150327030212 / files nightly mac e046475a75cb / 39.0a1 / 20150327030212 / files nightly win32 e046475a75cb / 39.0a1 / 20150327030212 / files nightly win64 e046475a75cb / 39.0a1 / 20150327030212 / files
last release without	nightly linux32 37d3dcbf23a9 / 39.0a1 / 20150326030212 / files nightly linux64 37d3dcbf23a9 / 39.0a1 / 20150326030212 / files nightly mac 37d3dcbf23a9 / 39.0a1 / 20150326030212 / files nightly win32 37d3dcbf23a9 / 39.0a1 / 20150326030212 / files nightly win64 37d3dcbf23a9 / 39.0a1 / 20150326030212 / files

--- a/media/libstagefright/binding/MoofParser.cpp
+++ b/media/libstagefright/binding/MoofParser.cpp
@@ -667,17 +667,16 @@ Edts::Edts(Box& aBox)
   uint64_t segment_duration;
   if (version == 1) {
     segment_duration = reader->ReadU64();
     mMediaStart = reader->Read64();
   } else {
     segment_duration = reader->ReadU32();
     mMediaStart = reader->Read32();
   }
-  NS_ASSERTION(segment_duration == 0, "Can't handle edits with fixed durations");
   reader->DiscardRemaining();
 }
 
 Saiz::Saiz(Box& aBox, AtomType aDefaultType)
   : mAuxInfoType(aDefaultType)
   , mAuxInfoTypeParameter(0)
 {
   BoxReader reader(aBox);