michael@0: diff --git a/media/libvpx/vp8/common/setupintrarecon.h b/media/libvpx/vp8/common/setupintrarecon.h
michael@0: index e515c3a..9317a6d 100644
michael@0: --- a/media/libvpx/vp8/common/setupintrarecon.h
michael@0: +++ b/media/libvpx/vp8/common/setupintrarecon.h
michael@0: @@ -3,16 +3,18 @@
michael@0:   *
michael@0:   *  Use of this source code is governed by a BSD-style license
michael@0:   *  that can be found in the LICENSE file in the root of the source
michael@0:   *  tree. An additional intellectual property rights grant can be found
michael@0:   *  in the file PATENTS.  All contributing project authors may
michael@0:   *  be found in the AUTHORS file in the root of the source tree.
michael@0:   */
michael@0:  
michael@0: +#ifndef SETUPINTRARECON_H
michael@0: +#define SETUPINTRARECON_H
michael@0:  
michael@0:  #include "vpx_scale/yv12config.h"
michael@0:  extern void vp8_setup_intra_recon(YV12_BUFFER_CONFIG *ybf);
michael@0:  extern void vp8_setup_intra_recon_top_line(YV12_BUFFER_CONFIG *ybf);
michael@0:  
michael@0:  static
michael@0:  void setup_intra_recon_left(unsigned char *y_buffer,
michael@0:                              unsigned char *u_buffer,
michael@0: @@ -26,8 +28,10 @@ void setup_intra_recon_left(unsigned char *y_buffer,
michael@0:          y_buffer[y_stride *i] = (unsigned char) 129;
michael@0:  
michael@0:      for (i = 0; i < 8; i++)
michael@0:          u_buffer[uv_stride *i] = (unsigned char) 129;
michael@0:  
michael@0:      for (i = 0; i < 8; i++)
michael@0:          v_buffer[uv_stride *i] = (unsigned char) 129;
michael@0:  }
michael@0: +
michael@0: +#endif
michael@0: diff --git a/media/libvpx/vpx_ports/vpx_once.h b/media/libvpx/vpx_ports/vpx_once.h
michael@0: index 16a735c..0387a71 100644
michael@0: --- a/media/libvpx/vpx_ports/vpx_once.h
michael@0: +++ b/media/libvpx/vpx_ports/vpx_once.h
michael@0: @@ -2,16 +2,19 @@
michael@0:   *  Copyright (c) 2011 The WebM project authors. All Rights Reserved.
michael@0:   *
michael@0:   *  Use of this source code is governed by a BSD-style license
michael@0:   *  that can be found in the LICENSE file in the root of the source
michael@0:   *  tree. An additional intellectual property rights grant can be found
michael@0:   *  in the file PATENTS.  All contributing project authors may
michael@0:   *  be found in the AUTHORS file in the root of the source tree.
michael@0:   */
michael@0: +#ifndef VPX_ONCE_H
michael@0: +#define VPX_ONCE_H
michael@0: +
michael@0:  #include "vpx_config.h"
michael@0:  
michael@0:  #if CONFIG_MULTITHREAD && defined(_WIN32)
michael@0:  #include <windows.h>
michael@0:  #include <stdlib.h>
michael@0:  static void once(void (*func)(void))
michael@0:  {
michael@0:      static CRITICAL_SECTION *lock;
michael@0: @@ -90,8 +93,10 @@ static void once(void (*func)(void))
michael@0:  
michael@0:      if(!done)
michael@0:      {
michael@0:          func();
michael@0:          done = 1;
michael@0:      }
michael@0:  }
michael@0:  #endif
michael@0: +
michael@0: +#endif
michael@0: diff --git a/media/libvpx/vp8/common/loopfilter.c b/media/libvpx/vp8/common/loopfilter.c
michael@0: index 19857a7..3c0fa63 100644
michael@0: --- a/media/libvpx/vp8/common/loopfilter.c
michael@0: +++ b/media/libvpx/vp8/common/loopfilter.c
michael@0: @@ -15,8 +15,6 @@
michael@0:  #include "onyxc_int.h"
michael@0:  #include "vpx_mem/vpx_mem.h"
michael@0:  
michael@0: -typedef unsigned char uc;
michael@0: -
michael@0:  static void lf_init_lut(loop_filter_info_n *lfi)
michael@0:  {
michael@0:      int filt_lvl;