Merge "Moved vp8_encode_bool into boolhuff.h"
diff --git a/vp8/decoder/arm/armv5/dequantize_v5.asm b/vp8/decoder/arm/armv5/dequantize_v5.asm
deleted file mode 100644
index de3648a..0000000
--- a/vp8/decoder/arm/armv5/dequantize_v5.asm
+++ /dev/null
@@ -1,52 +0,0 @@
-;
-; 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.
-;
-
-
- EXPORT |vp8_dequantize_b_armv5|
-
- AREA |.text|, CODE, READONLY ; name this block of code
-
-q RN r0
-dqc RN r1
-cnt RN r2
-
-;void dequantize_b_armv5(short *Q, short *DQC)
-|vp8_dequantize_b_armv5| PROC
- stmdb sp!, {r4, lr}
- ldr r3, [q]
- ldr r4, [dqc], #8
-
- mov cnt, #4
-dequant_loop
- smulbb lr, r3, r4
- smultt r12, r3, r4
-
- ldr r3, [q, #4]
- ldr r4, [dqc, #-4]
-
- strh lr, [q], #2
- strh r12, [q], #2
-
- smulbb lr, r3, r4
- smultt r12, r3, r4
-
- subs cnt, cnt, #1
- ldrne r3, [q, #4]
- ldrne r4, [dqc], #8
-
- strh lr, [q], #2
- strh r12, [q], #2
-
- bne dequant_loop
-
- ldmia sp!, {r4, pc}
- ENDP ;|vp8_dequantize_b_arm|
-
- END
diff --git a/vpx/internal/vpx_codec_internal.h b/vpx/internal/vpx_codec_internal.h
index 7cc2c3a..a1ff192 100644
--- a/vpx/internal/vpx_codec_internal.h
+++ b/vpx/internal/vpx_codec_internal.h
@@ -45,7 +45,6 @@
#define VPX_CODEC_INTERNAL_H
#include "../vpx_decoder.h"
#include "../vpx_encoder.h"
-#include "vpx_config.h"
#include <stdarg.h>
@@ -436,23 +435,6 @@
#include <stdio.h>
#include <setjmp.h>
-
-/* GLIBC started intercepting calls to longjmp in version 2.11, if the
- * FORTIFY_SOURCE flag is defined (it's defined by default on Ubuntu).
- * This can cause problems running under older versions of GLIBC (ie,
- * for binary distributions), so work around it by linking to the
- * underlying longjmp call directly.
- */
-#if defined(__GNUC_PREREQ)
-#if __GNUC_PREREQ (2,11)
-#if ARCH_X86_64
-__asm__(".symver __longjmp_chk,longjmp@GLIBC_2.2.5");
-#else
-__asm__(".symver __longjmp_chk,longjmp@GLIBC_2.0");
-#endif
-#endif
-#endif
-
struct vpx_internal_error_info
{
vpx_codec_err_t error_code;
