xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 12:09:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move an int64_t down in MpegEncContext

Browse Source 
This allows using the same arm assembler offsets for both EABI
and the mach-o ABI.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2011-08-01 17:18:13 +03:00
parent 62ee0e6a97
commit d0a2f0af9d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/arm/asm-offsets.h
View File

@ -29,11 +29,11 @@
#endif #endif
/* MpegEncContext */ /* MpegEncContext */
#define Y_DC_SCALE 0xb4 #define Y_DC_SCALE 0xa8
#define C_DC_SCALE 0xb8 #define C_DC_SCALE 0xac
#define AC_PRED 0xbc #define AC_PRED 0xb0
#define BLOCK_LAST_INDEX 0xc0 #define BLOCK_LAST_INDEX 0xb4
#define H263_AIC 0xf0 #define H263_AIC 0xe4
#define INTER_SCANTAB_RASTER_END 0x138 #define INTER_SCANTAB_RASTER_END 0x12c
#endif /* AVCODEC_ARM_ASM_OFFSETS_H */ #endif /* AVCODEC_ARM_ASM_OFFSETS_H */

3
libavcodec/mpegvideo.h
View File

@ -234,7 +234,6 @@ typedef struct MpegEncContext {
int picture_number; //FIXME remove, unclear definition int picture_number; //FIXME remove, unclear definition
int picture_in_gop_number; ///< 0-> first pic in gop, ... int picture_in_gop_number; ///< 0-> first pic in gop, ...
int b_frames_since_non_b; ///< used for encoding, relative to not yet reordered input int b_frames_since_non_b; ///< used for encoding, relative to not yet reordered input
int64_t user_specified_pts;///< last non zero pts from AVFrame which was passed into avcodec_encode_video()
int mb_width, mb_height; ///< number of MBs horizontally & vertically int mb_width, mb_height; ///< number of MBs horizontally & vertically
int mb_stride; ///< mb_width+1 used for some arrays to allow simple addressing of left & top MBs without sig11 int mb_stride; ///< mb_width+1 used for some arrays to allow simple addressing of left & top MBs without sig11
int b8_stride; ///< 2*mb_width+1 used for some 8x8 block arrays to allow simple addressing int b8_stride; ///< 2*mb_width+1 used for some 8x8 block arrays to allow simple addressing
@ -261,6 +260,8 @@ typedef struct MpegEncContext {
/* WARNING: changes above this line require updates to hardcoded /* WARNING: changes above this line require updates to hardcoded
* offsets used in asm. */ * offsets used in asm. */
int64_t user_specified_pts;///< last non zero pts from AVFrame which was passed into avcodec_encode_video()
/** bit output */ /** bit output */
PutBitContext pb; PutBitContext pb;