Merge remote branch 'qatar/master'

[ffmpeg] / libavcodec / arm / asm-offsets.h

diff --git a/libavcodec/arm/asm-offsets.h b/libavcodec/arm/asm-offsets.h
index 1d54e632b0bacb571257a7f8920bdff27c15c862..7f73534834b5cc73afc7f488290388834d7a5bfd 100644 (file)
--- a/libavcodec/arm/asm-offsets.h
+++ b/libavcodec/arm/asm-offsets.h
@@ -29,20 +29,11 @@
 #endif
 
 /* MpegEncContext */
-#if defined(__ARM_EABI__) || defined(__eabi__)
-#define Y_DC_SCALE               0xab4
-#define C_DC_SCALE               0xab8
-#define AC_PRED                  0xae0
-#define BLOCK_LAST_INDEX         0x21c0
-#define INTER_SCANTAB_RASTER_END 0x23c0
-#define H263_AIC                 0x2670
-#elif defined(__APPLE__)
-#define Y_DC_SCALE               0xa30
-#define C_DC_SCALE               0xa34
-#define AC_PRED                  0xa5c
-#define BLOCK_LAST_INDEX         0x213c
-#define INTER_SCANTAB_RASTER_END 0x233c
-#define H263_AIC                 0x25e0
-#endif
+#define Y_DC_SCALE               0xb4
+#define C_DC_SCALE               0xb8
+#define AC_PRED                  0xbc
+#define BLOCK_LAST_INDEX         0xc0
+#define H263_AIC                 0xf0
+#define INTER_SCANTAB_RASTER_END 0x138
 
 #endif