libvpx: Pull from upstream

source/libvpx/vp8/decoder/decodframe.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 
 #include "vpx_config.h"
 #include "vp8_rtcd.h"
 #include "./vpx_scale_rtcd.h"
 #include "onyxd_int.h"
 #include "vp8/common/header.h"
 #include "vp8/common/reconintra4x4.h"
 #include "vp8/common/reconinter.h"
 #include "detokenize.h"
 #include "vp8/common/invtrans.h"
 #include "vp8/common/alloccommon.h"
 #include "vp8/common/entropymode.h"
 #include "vp8/common/quant_common.h"
-#include "vpx_scale/vpxscale.h"
+#include "vpx_scale/vpx_scale.h"
 #include "vp8/common/setupintrarecon.h"
 
 #include "decodemv.h"
 #include "vp8/common/extend.h"
 #if CONFIG_ERROR_CONCEALMENT
 #include "error_concealment.h"
 #endif
 #include "vpx_mem/vpx_mem.h"
 #include "vp8/common/threading.h"
 #include "decoderthreading.h"
@@ skipping 1342 matching lines @@
         FILE *f = fopen("decompressor.VP8", "ab");
         unsigned int size = pbi->bc2.pos + pbi->bc.pos + 8;
         fwrite((void *) &size, 4, 1, f);
         fwrite((void *) pbi->Source, size, 1, f);
         fclose(f);
     }
 #endif
 
     return 0;
 }