| Index: patches/to_upstream/16_neon_offsets.patch
|
| ===================================================================
|
| --- patches/to_upstream/16_neon_offsets.patch (revision 62568)
|
| +++ patches/to_upstream/16_neon_offsets.patch (working copy)
|
| @@ -1,30 +1,22 @@
|
| diff -rpu -N orig/libavcodec/arm/asm-offsets.h ffmpeg-mt/libavcodec/arm/asm-offsets.h
|
| ---- orig/libavcodec/arm/asm-offsets.h 2010-10-14 09:51:12 -0700
|
| -+++ ffmpeg-mt/libavcodec/arm/asm-offsets.h 2010-10-14 09:52:33 -0700
|
| -@@ -29,20 +29,10 @@
|
| - #endif
|
| +--- orig/libavcodec/arm/asm-offsets.h 2010-10-14 10:53:25 -0700
|
| ++++ ffmpeg-mt/libavcodec/arm/asm-offsets.h 2010-10-14 10:54:20 -0700
|
| +@@ -30,12 +30,12 @@
|
|
|
| /* MpegEncContext */
|
| --#if defined(__ARM_EABI__) || defined(__eabi__)
|
| + #if defined(__ARM_EABI__) || defined(__eabi__)
|
| -#define Y_DC_SCALE 0xa54
|
| -#define C_DC_SCALE 0xa58
|
| -#define AC_PRED 0xa80
|
| -#define BLOCK_LAST_INDEX 0x2160
|
| -#define INTER_SCANTAB_RASTER_END 0x2360
|
| -#define H263_AIC 0x2610
|
| --#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 ((int)&(((MpegEncContext*)0)->y_dc_scale))
|
| -+#define C_DC_SCALE ((int)&(((MpegEncContext*)0)->c_dc_scale))
|
| -+#define AC_PRED ((int)&(((MpegEncContext*)0)->ac_pred))
|
| -+#define BLOCK_LAST_INDEX ((int)&(((MpegEncContext*)0)->block_last_index[0]))
|
| -+#define INTER_SCANTAB_RASTER_END ((int)&(((MpegEncContext*)0)->inter_scantable.raster_end))
|
| -+#define H263_AIC ((int)&(((MpegEncContext*)0)->h263_aic))
|
| - #endif
|
| ++#define Y_DC_SCALE (0xa54+72)
|
| ++#define C_DC_SCALE (0xa58+72)
|
| ++#define AC_PRED (0xa80+72)
|
| ++#define BLOCK_LAST_INDEX (0x2160+72)
|
| ++#define INTER_SCANTAB_RASTER_END (0x2360+72)
|
| ++#define H263_AIC (0x2610+80)
|
| + #elif defined(__APPLE__)
|
| + #define Y_DC_SCALE 0xa30
|
| + #define C_DC_SCALE 0xa34
|
|
|