avcodec/h264_cabac: move the arm unchecked_bitstream reader special case closer to...
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Mar 2014 00:02:31 +0000 (01:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Mar 2014 00:02:31 +0000 (01:02 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_cabac.c

index 75b12ec..e6fc652 100644 (file)
@@ -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