From 2b8d28439b6e0d368d31cecedb2edbc64375b3bf Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 15 Mar 2014 01:02:31 +0100 Subject: [PATCH] avcodec/h264_cabac: move the arm unchecked_bitstream reader special case closer to where the issue is Signed-off-by: Michael Niedermayer --- libavcodec/h264_cabac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 75b12ec641..e6fc652794 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -26,7 +26,7 @@ */ #define CABAC(h) 1 -#define UNCHECKED_BITSTREAM_READER (!ARCH_ARM && !ARCH_AARCH64) +#define UNCHECKED_BITSTREAM_READER 1 #include "libavutil/attributes.h" #include "libavutil/timer.h" @@ -1620,7 +1620,7 @@ decode_cabac_residual_internal(H264Context *h, int16_t *block, cc.range = h->cabac.range; cc.low = h->cabac.low; cc.bytestream= h->cabac.bytestream; -#if !UNCHECKED_BITSTREAM_READER +#if !UNCHECKED_BITSTREAM_READER || ARCH_ARM || ARCH_AARCH64 cc.bytestream_end = h->cabac.bytestream_end; #endif #else