Index: branches/2015Q1/www/firefox/files/patch-bug1122586
===================================================================
--- branches/2015Q1/www/firefox/files/patch-bug1122586	(nonexistent)
+++ branches/2015Q1/www/firefox/files/patch-bug1122586	(revision 377575)
@@ -0,0 +1,30 @@
+diff --git content/media/MediaDecoderStateMachine.cpp content/media/MediaDecoderStateMachine.cpp
+index 36a6ccf..96d3bd0 100644
+--- content/media/MediaDecoderStateMachine.cpp
++++ content/media/MediaDecoderStateMachine.cpp
+@@ -18,6 +18,7 @@
+ #include "nsTArray.h"
+ #include "MediaDecoder.h"
+ #include "MediaDecoderReader.h"
++#include "mozilla/MathAlgorithms.h"
+ #include "mozilla/mozalloc.h"
+ #include "VideoUtils.h"
+ #include "mozilla/dom/TimeRanges.h"
+@@ -165,7 +166,7 @@ static_assert(QUICK_BUFFERING_LOW_DATA_USECS <= AMPLE_AUDIO_USECS,
+ // MediaDecoderStateMachine::UpdateEstimatedDuration(); changes of duration
+ // less than this are ignored, as they're assumed to be the result of
+ // instability in the duration estimation.
+-static const int64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
++static const uint64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
+ 
+ static TimeDuration UsecsToDuration(int64_t aUsecs) {
+   return TimeDuration::FromMicroseconds(aUsecs);
+@@ -1447,7 +1448,7 @@ void MediaDecoderStateMachine::UpdateEstimatedDuration(int64_t aDuration)
+   AssertCurrentThreadInMonitor();
+   int64_t duration = GetDuration();
+   if (aDuration != duration &&
+-      std::abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
++      mozilla::Abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
+     SetDuration(aDuration);
+     nsCOMPtr<nsIRunnable> event =
+       NS_NewRunnableMethod(mDecoder, &MediaDecoder::DurationChanged);

Property changes on: branches/2015Q1/www/firefox/files/patch-bug1122586
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2015Q1/www/seamonkey/files/patch-bug1122586
===================================================================
--- branches/2015Q1/www/seamonkey/files/patch-bug1122586	(nonexistent)
+++ branches/2015Q1/www/seamonkey/files/patch-bug1122586	(revision 377575)
@@ -0,0 +1,30 @@
+diff --git content/media/MediaDecoderStateMachine.cpp content/media/MediaDecoderStateMachine.cpp
+index 36a6ccf..96d3bd0 100644
+--- mozilla/content/media/MediaDecoderStateMachine.cpp
++++ mozilla/content/media/MediaDecoderStateMachine.cpp
+@@ -18,6 +18,7 @@
+ #include "nsTArray.h"
+ #include "MediaDecoder.h"
+ #include "MediaDecoderReader.h"
++#include "mozilla/MathAlgorithms.h"
+ #include "mozilla/mozalloc.h"
+ #include "VideoUtils.h"
+ #include "mozilla/dom/TimeRanges.h"
+@@ -165,7 +166,7 @@ static_assert(QUICK_BUFFERING_LOW_DATA_USECS <= AMPLE_AUDIO_USECS,
+ // MediaDecoderStateMachine::UpdateEstimatedDuration(); changes of duration
+ // less than this are ignored, as they're assumed to be the result of
+ // instability in the duration estimation.
+-static const int64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
++static const uint64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
+ 
+ static TimeDuration UsecsToDuration(int64_t aUsecs) {
+   return TimeDuration::FromMicroseconds(aUsecs);
+@@ -1447,7 +1448,7 @@ void MediaDecoderStateMachine::UpdateEstimatedDuration(int64_t aDuration)
+   AssertCurrentThreadInMonitor();
+   int64_t duration = GetDuration();
+   if (aDuration != duration &&
+-      std::abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
++      mozilla::Abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
+     SetDuration(aDuration);
+     nsCOMPtr<nsIRunnable> event =
+       NS_NewRunnableMethod(mDecoder, &MediaDecoder::DurationChanged);

Property changes on: branches/2015Q1/www/seamonkey/files/patch-bug1122586
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2015Q1
===================================================================
--- branches/2015Q1	(revision 377574)
+++ branches/2015Q1	(revision 377575)

Property changes on: branches/2015Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r377551