Back out cset caa78bef50e3 (bug 950506) for build failure on Windows when warnings are treated as errors

content/media/MP3FrameParser.h

@@ -4,9 +4,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef MP3FrameParser_h
-#define MP3FrameParser_h
-
 #include <stdint.h>
 
 #include "mozilla/Mutex.h"
@@ -208,5 +205,3 @@ private:
 };
 
 }
-
-#endif

content/media/directshow/moz.build

@@ -12,7 +12,7 @@ EXPORTS += [
     'DirectShowUtils.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'AudioSinkFilter.cpp',
     'AudioSinkInputPin.cpp',
     'DirectShowDecoder.cpp',