diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-04 01:40:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-04 01:40:29 +0200 |
| commit | 64160ef39216b2d40eb34c13421febe045ddcf8a (patch) | |
| tree | f5d63c19adb037a18baf2689f503f165b9c39aaf /libavcodec/arm/asm-offsets.h | |
| parent | 72b0c9f55f26049e22bf147ab120173bd1d54cd5 (diff) | |
| parent | fed6c90b68fa00ad399e0b6d51c1e41d0d3730a0 (diff) | |
| download | ffmpeg-64160ef39216b2d40eb34c13421febe045ddcf8a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cosmetics: remove some stray comments from AVCodec declarations
cosmetics: fix indentation/alignment in AVCodec declarations
arm: Avoid using the movw instruction needlessly
Move an int64_t down in MpegEncContext
Conflicts:
libavcodec/arm/ac3dsp_armv6.S
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/asm-offsets.h')
| -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 fe124ba702..5cfc5cb10c 100644 --- a/libavcodec/arm/asm-offsets.h +++ b/libavcodec/arm/asm-offsets.h @@ -29,11 +29,11 @@ #endif /* MpegEncContext */ -#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 +#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 #endif /* AVCODEC_ARM_ASM_OFFSETS_H */ |