Bug 830247: small changes resulting from Try build r=ted rs=me

media/webrtc/signaling/test/mediapipeline_unittest.cpp

@@ -47,7 +47,7 @@ class TestAgent {
       audio_flow_(new TransportFlow()),
       audio_prsock_(new TransportLayerPrsock()),
       audio_dtls_(new TransportLayerDtls()),
-      audio_config_(109, "opus", 48000, 480, 1, 64000),
+      audio_config_(109, "opus", 48000, 960, 2, 64000),
       audio_conduit_(mozilla::AudioSessionConduit::Create(NULL)),
       audio_(),
       audio_pipeline_(),

media/webrtc/trunk/peerconnection_client.target.mk

@@ -3,7 +3,7 @@
 TOOLSET := target
 TARGET := peerconnection_client
 DEFS_Debug := \
-	'-DWEBRTC_SVNREVISION="Unavailable(issue687)"' \
+	'-DWEBRTC_SVNREVISION="Unavailable_issue687"' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -93,7 +93,7 @@ INCS_Debug := \
 	-Itesting/gtest/include
 
 DEFS_Release := \
-	'-DWEBRTC_SVNREVISION="Unavailable(issue687)"' \
+	'-DWEBRTC_SVNREVISION="Unavailable_issue687"' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \

media/webrtc/trunk/third_party/opus/opus.gyp

@@ -21,6 +21,9 @@
           'cflags': [
             '-std=c99',
           ],
+          'cflags_mozilla': [
+            '-std=c99',
+          ],
           'defines': [
             'HAVE_LRINTF',
           ],

media/webrtc/trunk/webrtc/build/common.gypi

@@ -146,7 +146,7 @@
     'defines': [
       # TODO(leozwang): Run this as a gclient hook rather than at build-time:
       # http://code.google.com/p/webrtc/issues/detail?id=687
-      'WEBRTC_SVNREVISION="\\\"Unavailable(issue687)\\\""',
+      'WEBRTC_SVNREVISION="\\\"Unavailable_issue687\\\""',
       #'WEBRTC_SVNREVISION="<!(python <(webrtc_root)/build/version.py)"',
     ],
     'conditions': [

media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing.gypi

@@ -152,6 +152,7 @@
             'aec/aec_rdft_sse2.c',
           ],
           'cflags': ['-msse2',],
+          'cflags_mozilla': [ '-msse2', ],
           'xcode_settings': {
             'OTHER_CFLAGS': ['-msse2',],
           },

media/webrtc/trunk/webrtc/modules/udp_transport/source/udp_transport.gypi

@@ -71,6 +71,9 @@
           'cflags': [
             '-fno-strict-aliasing',
           ],
+          'cflags_mozilla': [
+            '-fno-strict-aliasing',
+          ],
         }],
         ['OS=="mac"', {
           'xcode_settings': {

media/webrtc/trunk/webrtc/modules/video_render/video_render.gypi

@@ -119,11 +119,6 @@
             'include_dirs': ['mac',],
           },
         }],
-        ['OS=="win"', {
-          'include_dirs': [
-            '<(directx_sdk_path)/Include',
-          ],
-        }],
         ['OS!="win" or include_internal_video_render==0', {
           'sources!': [
             'windows/i_video_render_win.h',