The Tor Browser / file diff

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/media/libvpx/unified.patch	Wed Dec 31 06:09:35 2014 +0100
     1.3 @@ -0,0 +1,82 @@
     1.4 +diff --git a/media/libvpx/vp8/common/setupintrarecon.h b/media/libvpx/vp8/common/setupintrarecon.h
     1.5 +index e515c3a..9317a6d 100644
     1.6 +--- a/media/libvpx/vp8/common/setupintrarecon.h
     1.7 ++++ b/media/libvpx/vp8/common/setupintrarecon.h
     1.8 +@@ -3,16 +3,18 @@
     1.9 +  *
    1.10 +  *  Use of this source code is governed by a BSD-style license
    1.11 +  *  that can be found in the LICENSE file in the root of the source
    1.12 +  *  tree. An additional intellectual property rights grant can be found
    1.13 +  *  in the file PATENTS.  All contributing project authors may
    1.14 +  *  be found in the AUTHORS file in the root of the source tree.
    1.15 +  */
    1.16 + 
    1.17 ++#ifndef SETUPINTRARECON_H
    1.18 ++#define SETUPINTRARECON_H
    1.19 + 
    1.20 + #include "vpx_scale/yv12config.h"
    1.21 + extern void vp8_setup_intra_recon(YV12_BUFFER_CONFIG *ybf);
    1.22 + extern void vp8_setup_intra_recon_top_line(YV12_BUFFER_CONFIG *ybf);
    1.23 + 
    1.24 + static
    1.25 + void setup_intra_recon_left(unsigned char *y_buffer,
    1.26 +                             unsigned char *u_buffer,
    1.27 +@@ -26,8 +28,10 @@ void setup_intra_recon_left(unsigned char *y_buffer,
    1.28 +         y_buffer[y_stride *i] = (unsigned char) 129;
    1.29 + 
    1.30 +     for (i = 0; i < 8; i++)
    1.31 +         u_buffer[uv_stride *i] = (unsigned char) 129;
    1.32 + 
    1.33 +     for (i = 0; i < 8; i++)
    1.34 +         v_buffer[uv_stride *i] = (unsigned char) 129;
    1.35 + }
    1.36 ++
    1.37 ++#endif
    1.38 +diff --git a/media/libvpx/vpx_ports/vpx_once.h b/media/libvpx/vpx_ports/vpx_once.h
    1.39 +index 16a735c..0387a71 100644
    1.40 +--- a/media/libvpx/vpx_ports/vpx_once.h
    1.41 ++++ b/media/libvpx/vpx_ports/vpx_once.h
    1.42 +@@ -2,16 +2,19 @@
    1.43 +  *  Copyright (c) 2011 The WebM project authors. All Rights Reserved.
    1.44 +  *
    1.45 +  *  Use of this source code is governed by a BSD-style license
    1.46 +  *  that can be found in the LICENSE file in the root of the source
    1.47 +  *  tree. An additional intellectual property rights grant can be found
    1.48 +  *  in the file PATENTS.  All contributing project authors may
    1.49 +  *  be found in the AUTHORS file in the root of the source tree.
    1.50 +  */
    1.51 ++#ifndef VPX_ONCE_H
    1.52 ++#define VPX_ONCE_H
    1.53 ++
    1.54 + #include "vpx_config.h"
    1.55 + 
    1.56 + #if CONFIG_MULTITHREAD && defined(_WIN32)
    1.57 + #include <windows.h>
    1.58 + #include <stdlib.h>
    1.59 + static void once(void (*func)(void))
    1.60 + {
    1.61 +     static CRITICAL_SECTION *lock;
    1.62 +@@ -90,8 +93,10 @@ static void once(void (*func)(void))
    1.63 + 
    1.64 +     if(!done)
    1.65 +     {
    1.66 +         func();
    1.67 +         done = 1;
    1.68 +     }
    1.69 + }
    1.70 + #endif
    1.71 ++
    1.72 ++#endif
    1.73 +diff --git a/media/libvpx/vp8/common/loopfilter.c b/media/libvpx/vp8/common/loopfilter.c
    1.74 +index 19857a7..3c0fa63 100644
    1.75 +--- a/media/libvpx/vp8/common/loopfilter.c
    1.76 ++++ b/media/libvpx/vp8/common/loopfilter.c
    1.77 +@@ -15,8 +15,6 @@
    1.78 + #include "onyxc_int.h"
    1.79 + #include "vpx_mem/vpx_mem.h"
    1.80 + 
    1.81 +-typedef unsigned char uc;
    1.82 +-
    1.83 + static void lf_init_lut(loop_filter_info_n *lfi)
    1.84 + {
    1.85 +     int filt_lvl;