Backed out changeset 7545a33148f1 (bug 1287397) for Valgrind failures

dom/media/wave/WaveDemuxer.cpp

@@ -113,6 +113,8 @@ WAVTrackDemuxer::Init()
     uint32_t aChunkName = mHeaderParser.GiveHeader().ChunkName();
     uint32_t aChunkSize = mHeaderParser.GiveHeader().ChunkSize();
 
+    aChunkSize += aChunkSize % 2;
+
     if (aChunkName == FRMT_CODE) {
       if (!FmtChunkParserInit()) {
         return false;
@@ -133,8 +135,7 @@ WAVTrackDemuxer::Init()
       }
       break;
     } else {
-      // Wave files are 2-byte aligned so we need to round up
+      mOffset += aChunkSize; // Skip other irrelevant chunks.
-      mOffset += (aChunkSize + 1) & ~1; // Skip other irrelevant chunks.
     }
     mHeaderParser.Reset();
   }