Backed out changeset ac2f07864fb1 (bug 1284803)
authorIris Hsiao <ihsiao@mozilla.com>
Tue, 26 Jul 2016 10:21:57 +0800
changeset 348732 1328c16d3bba0febdbb7aa786e2afb96d4fadfaf
parent 348731 104e19b8f12a0b59fb5d16b07b4fecf6c211bddb
child 348733 7a5831b9072315d4df182c06368919f5b0d45792
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1284803
milestone50.0a1
backs outac2f07864fb1059969eca26ffaa95a192d73cb07
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset ac2f07864fb1 (bug 1284803)
media/libyuv/libyuv.gyp
media/libyuv/moz.build
--- a/media/libyuv/libyuv.gyp
+++ b/media/libyuv/libyuv.gyp
@@ -75,24 +75,16 @@
             ['target_arch != "arm64"', {
               'cflags': [
                 '-mfpu=neon',
                 # '-marm',  # arm32 not thumb
               ],
             }],
           ],
         }],
-        ['build_with_mozilla == 1', {
-          'defines': [
-            'HAVE_JPEG'
-          ],
-          'cflags_mozilla': [
-            '$(MOZ_JPEG_CFLAGS)',
-          ],
-        }],
         ['OS != "ios" and libyuv_disable_jpeg != 1 and build_with_mozilla != 1', {
           'defines': [
             'HAVE_JPEG'
           ],
           'conditions': [
             # Caveat system jpeg support may not support motion jpeg
             [ 'use_system_libjpeg == 1', {
               'dependencies': [
--- a/media/libyuv/moz.build
+++ b/media/libyuv/moz.build
@@ -6,17 +6,16 @@
 
 include('/build/gyp.mozbuild')
 
 GYP_DIRS += ['.']
 
 libyuv_non_unified_sources = [
     'source/convert.cc',
     'source/convert_from.cc',
-    'source/mjpeg_decoder.cc',
     'source/rotate_argb.cc',
     'source/row_common.cc',
     'source/scale.cc',
     'source/scale_common.cc',
 ]
 GYP_DIRS['.'].input = 'libyuv.gyp'
 GYP_DIRS['.'].variables = gyp_vars
 GYP_DIRS['.'].sandbox_vars['FINAL_LIBRARY'] = 'xul'