diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 00:22:53 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 00:23:01 +0200 |
commit | 8b30702c44040c13abe759fa48673af7af417de9 (patch) | |
tree | f3d58ef363dc00431305f6aa63a6febf4a049d23 /libavcodec/arm | |
parent | ed72dae4cf80a3087f6ca050bc34facd1be3f98f (diff) | |
parent | 6a13505c069890cb0e2a07e29fd819a0cf2e73c1 (diff) | |
download | ffmpeg-8b30702c44040c13abe759fa48673af7af417de9.tar.gz |
Merge commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1'
* commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1':
mpegvideo: move the MpegEncContext fields used from arm asm to the beginning
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
-rw-r--r-- | libavcodec/arm/asm-offsets.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/arm/asm-offsets.h b/libavcodec/arm/asm-offsets.h index 37a67975fd..a2174b0a08 100644 --- a/libavcodec/arm/asm-offsets.h +++ b/libavcodec/arm/asm-offsets.h @@ -22,11 +22,11 @@ #define AVCODEC_ARM_ASM_OFFSETS_H /* MpegEncContext */ -#define Y_DC_SCALE 0xa8 -#define C_DC_SCALE 0xac -#define AC_PRED 0xb0 -#define BLOCK_LAST_INDEX 0xb4 -#define H263_AIC 0xe4 -#define INTER_SCANTAB_RASTER_END 0x12c +#define Y_DC_SCALE 0x04 +#define C_DC_SCALE 0x08 +#define AC_PRED 0x0c +#define BLOCK_LAST_INDEX 0x10 +#define H263_AIC 0x40 +#define INTER_SCANTAB_RASTER_END 0x88 #endif /* AVCODEC_ARM_ASM_OFFSETS_H */ |