[SVN-Commit] r1493 - in trunk/www: firefox-nightly/files firefox/files seamonkey/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Tue Feb 11 21:28:32 2014
New Revision: 1493

Log:
sync gstreamer1 patch with landed version

Modified:
   trunk/www/firefox-nightly/files/patch-bug806917
   trunk/www/firefox/files/patch-bug806917
   trunk/www/seamonkey/files/patch-bug806917

Modified: trunk/www/firefox-nightly/files/patch-bug806917
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug806917	Tue Feb 11 21:11:25 2014	(r1492)
+++ trunk/www/firefox-nightly/files/patch-bug806917	Tue Feb 11 21:28:32 2014	(r1493)
@@ -890,7 +890,7 @@
  #include "VideoUtils.h"
  #include "mozilla/dom/TimeRanges.h"
  #include "mozilla/Preferences.h"
-@@ -31,14 +33,14 @@ extern PRLogModuleInfo* gMediaDecoderLog;
+@@ -31,14 +33,16 @@ extern PRLogModuleInfo* gMediaDecoderLog;
  #define LOG(type, msg)
  #endif
  
@@ -899,9 +899,11 @@
 -             const VideoData::YCbCrBuffer::Plane& aCbPlane,
 -             const VideoData::YCbCrBuffer::Plane& aCrPlane);
 -
++#if DEBUG
  static const unsigned int MAX_CHANNELS = 4;
 -// Let the demuxer work in pull mode for short files
 -static const int SHORT_FILE_SIZE = 1024 * 1024;
++#endif
 +// Let the demuxer work in pull mode for short files. This used to be a micro
 +// optimization to have more accurate durations for ogg files in mochitests.
 +// Since as of today we aren't using gstreamer to demux ogg, and having demuxers

Modified: trunk/www/firefox/files/patch-bug806917
==============================================================================
--- trunk/www/firefox/files/patch-bug806917	Tue Feb 11 21:11:25 2014	(r1492)
+++ trunk/www/firefox/files/patch-bug806917	Tue Feb 11 21:28:32 2014	(r1493)
@@ -887,7 +887,7 @@
  #include "VideoUtils.h"
  #include "mozilla/dom/TimeRanges.h"
  #include "mozilla/Preferences.h"
-@@ -31,14 +33,14 @@ extern PRLogModuleInfo* gMediaDecoderLog;
+@@ -31,14 +33,16 @@ extern PRLogModuleInfo* gMediaDecoderLog;
  #define LOG(type, msg)
  #endif
  
@@ -896,9 +896,11 @@
 -             const VideoData::YCbCrBuffer::Plane& aCbPlane,
 -             const VideoData::YCbCrBuffer::Plane& aCrPlane);
 -
++#if DEBUG
  static const unsigned int MAX_CHANNELS = 4;
 -// Let the demuxer work in pull mode for short files
 -static const int SHORT_FILE_SIZE = 1024 * 1024;
++#endif
 +// Let the demuxer work in pull mode for short files. This used to be a micro
 +// optimization to have more accurate durations for ogg files in mochitests.
 +// Since as of today we aren't using gstreamer to demux ogg, and having demuxers

Modified: trunk/www/seamonkey/files/patch-bug806917
==============================================================================
--- trunk/www/seamonkey/files/patch-bug806917	Tue Feb 11 21:11:25 2014	(r1492)
+++ trunk/www/seamonkey/files/patch-bug806917	Tue Feb 11 21:28:32 2014	(r1493)
@@ -887,7 +887,7 @@
  #include "VideoUtils.h"
  #include "mozilla/dom/TimeRanges.h"
  #include "mozilla/Preferences.h"
-@@ -31,14 +33,14 @@ extern PRLogModuleInfo* gMediaDecoderLog;
+@@ -31,14 +33,16 @@ extern PRLogModuleInfo* gMediaDecoderLog;
  #define LOG(type, msg)
  #endif
  
@@ -896,9 +896,11 @@
 -             const VideoData::YCbCrBuffer::Plane& aCbPlane,
 -             const VideoData::YCbCrBuffer::Plane& aCrPlane);
 -
++#if DEBUG
  static const unsigned int MAX_CHANNELS = 4;
 -// Let the demuxer work in pull mode for short files
 -static const int SHORT_FILE_SIZE = 1024 * 1024;
++#endif
 +// Let the demuxer work in pull mode for short files. This used to be a micro
 +// optimization to have more accurate durations for ogg files in mochitests.
 +// Since as of today we aren't using gstreamer to demux ogg, and having demuxers