The Tor Browser: media/libvpx/unified.patch@b8a032363ba2

Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6

     1 diff --git a/media/libvpx/vp8/common/setupintrarecon.h b/media/libvpx/vp8/common/setupintrarecon.h

     2 index e515c3a..9317a6d 100644

     3 --- a/media/libvpx/vp8/common/setupintrarecon.h

     4 +++ b/media/libvpx/vp8/common/setupintrarecon.h

     5 @@ -3,16 +3,18 @@

     6   *

     7   *  Use of this source code is governed by a BSD-style license

     8   *  that can be found in the LICENSE file in the root of the source

     9   *  tree. An additional intellectual property rights grant can be found

    10   *  in the file PATENTS.  All contributing project authors may

    11   *  be found in the AUTHORS file in the root of the source tree.

    12   */

    14 +#ifndef SETUPINTRARECON_H

    15 +#define SETUPINTRARECON_H

    17  #include "vpx_scale/yv12config.h"

    18  extern void vp8_setup_intra_recon(YV12_BUFFER_CONFIG *ybf);

    19  extern void vp8_setup_intra_recon_top_line(YV12_BUFFER_CONFIG *ybf);

    21  static

    22  void setup_intra_recon_left(unsigned char *y_buffer,

    23                              unsigned char *u_buffer,

    24 @@ -26,8 +28,10 @@ void setup_intra_recon_left(unsigned char *y_buffer,

    25          y_buffer[y_stride *i] = (unsigned char) 129;

    27      for (i = 0; i < 8; i++)

    28          u_buffer[uv_stride *i] = (unsigned char) 129;

    30      for (i = 0; i < 8; i++)

    31          v_buffer[uv_stride *i] = (unsigned char) 129;

    32  }

    33 +

    34 +#endif

    35 diff --git a/media/libvpx/vpx_ports/vpx_once.h b/media/libvpx/vpx_ports/vpx_once.h

    36 index 16a735c..0387a71 100644

    37 --- a/media/libvpx/vpx_ports/vpx_once.h

    38 +++ b/media/libvpx/vpx_ports/vpx_once.h

    39 @@ -2,16 +2,19 @@

    40   *  Copyright (c) 2011 The WebM project authors. All Rights Reserved.

    41   *

    42   *  Use of this source code is governed by a BSD-style license

    43   *  that can be found in the LICENSE file in the root of the source

    44   *  tree. An additional intellectual property rights grant can be found

    45   *  in the file PATENTS.  All contributing project authors may

    46   *  be found in the AUTHORS file in the root of the source tree.

    47   */

    48 +#ifndef VPX_ONCE_H

    49 +#define VPX_ONCE_H

    50 +

    51  #include "vpx_config.h"

    53  #if CONFIG_MULTITHREAD && defined(_WIN32)

    54  #include <windows.h>

    55  #include <stdlib.h>

    56  static void once(void (*func)(void))

    57  {

    58      static CRITICAL_SECTION *lock;

    59 @@ -90,8 +93,10 @@ static void once(void (*func)(void))

    61      if(!done)

    62      {

    63          func();

    64          done = 1;

    65      }

    66  }

    67  #endif

    68 +

    69 +#endif

    70 diff --git a/media/libvpx/vp8/common/loopfilter.c b/media/libvpx/vp8/common/loopfilter.c

    71 index 19857a7..3c0fa63 100644

    72 --- a/media/libvpx/vp8/common/loopfilter.c

    73 +++ b/media/libvpx/vp8/common/loopfilter.c

    74 @@ -15,8 +15,6 @@

    75  #include "onyxc_int.h"

    76  #include "vpx_mem/vpx_mem.h"

    78 -typedef unsigned char uc;

    79 -

    80  static void lf_init_lut(loop_filter_info_n *lfi)

    81  {

    82      int filt_lvl;

The Tor Browser / file revision