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/mpegvideo.h | |
parent | 72b0c9f55f26049e22bf147ab120173bd1d54cd5 (diff) | |
parent | fed6c90b68fa00ad399e0b6d51c1e41d0d3730a0 (diff) |
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/mpegvideo.h')
-rw-r--r-- | libavcodec/mpegvideo.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 327e735f92..a25e8aa4c7 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -235,7 +235,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 @@ -262,6 +261,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; |