OLD | NEW |
1 diff -rpu -N orig/libavcodec/arm/asm-offsets.h ffmpeg-mt/libavcodec/arm/asm-offs
ets.h | 1 diff -rpu -N orig/libavcodec/arm/asm-offsets.h ffmpeg-mt/libavcodec/arm/asm-offs
ets.h |
2 --- orig/libavcodec/arm/asm-offsets.h» 2010-10-14 09:51:12 -0700 | 2 --- orig/libavcodec/arm/asm-offsets.h» 2010-10-14 10:53:25 -0700 |
3 +++ ffmpeg-mt/libavcodec/arm/asm-offsets.h» 2010-10-14 09:52:33 -0700 | 3 +++ ffmpeg-mt/libavcodec/arm/asm-offsets.h» 2010-10-14 10:54:20 -0700 |
4 @@ -29,20 +29,10 @@ | 4 @@ -30,12 +30,12 @@ |
5 #endif | |
6 | 5 |
7 /* MpegEncContext */ | 6 /* MpegEncContext */ |
8 -#if defined(__ARM_EABI__) || defined(__eabi__) | 7 #if defined(__ARM_EABI__) || defined(__eabi__) |
9 -#define Y_DC_SCALE 0xa54 | 8 -#define Y_DC_SCALE 0xa54 |
10 -#define C_DC_SCALE 0xa58 | 9 -#define C_DC_SCALE 0xa58 |
11 -#define AC_PRED 0xa80 | 10 -#define AC_PRED 0xa80 |
12 -#define BLOCK_LAST_INDEX 0x2160 | 11 -#define BLOCK_LAST_INDEX 0x2160 |
13 -#define INTER_SCANTAB_RASTER_END 0x2360 | 12 -#define INTER_SCANTAB_RASTER_END 0x2360 |
14 -#define H263_AIC 0x2610 | 13 -#define H263_AIC 0x2610 |
15 -#elif defined(__APPLE__) | 14 +#define Y_DC_SCALE (0xa54+72) |
16 -#define Y_DC_SCALE 0xa30 | 15 +#define C_DC_SCALE (0xa58+72) |
17 -#define C_DC_SCALE 0xa34 | 16 +#define AC_PRED (0xa80+72) |
18 -#define AC_PRED 0xa5c | 17 +#define BLOCK_LAST_INDEX (0x2160+72) |
19 -#define BLOCK_LAST_INDEX 0x213c | 18 +#define INTER_SCANTAB_RASTER_END (0x2360+72) |
20 -#define INTER_SCANTAB_RASTER_END 0x233c | 19 +#define H263_AIC (0x2610+80) |
21 -#define H263_AIC 0x25e0 | 20 #elif defined(__APPLE__) |
22 -#endif | 21 #define Y_DC_SCALE 0xa30 |
23 - | 22 #define C_DC_SCALE 0xa34 |
24 +#define Y_DC_SCALE ((int)&(((MpegEncContext*)0)->y_dc_scale)) | |
25 +#define C_DC_SCALE ((int)&(((MpegEncContext*)0)->c_dc_scale)) | |
26 +#define AC_PRED ((int)&(((MpegEncContext*)0)->ac_pred)) | |
27 +#define BLOCK_LAST_INDEX ((int)&(((MpegEncContext*)0)->block_last_index
[0])) | |
28 +#define INTER_SCANTAB_RASTER_END ((int)&(((MpegEncContext*)0)->inter_scantable.
raster_end)) | |
29 +#define H263_AIC ((int)&(((MpegEncContext*)0)->h263_aic)) | |
30 #endif | |
OLD | NEW |