This allows using the same arm assembler offsets for both EABI
and the mach-o ABI.
---
libavcodec/arm/asm-offsets.h | 12 ++++++------
libavcodec/mpegvideo.h | 3 ++-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/libavcodec/arm/asm-offsets.h b/libavcodec/arm/asm-offsets.h
index 110d33d..8999456 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 */
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 315f319..00293db 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -234,7 +234,6 @@ typedef struct MpegEncContext {
int picture_number; //FIXME remove, unclear definition
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
- 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_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
@@ -261,6 +260,8 @@ typedef struct MpegEncContext {
/* WARNING: changes above this line require updates to hardcoded
* offsets used in asm. */
+ int64_t user_specified_pts;///< last non zero pts from AVFrame which was
passed into avcodec_encode_video()
+
/** bit output */
PutBitContext pb;
--
1.7.3.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
