diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-01-01 14:36:20 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-01-01 14:36:20 +0000 |
| commit | b07a59805ed59800b5800d687a347eb15a9630dc (patch) | |
| tree | d73ecc4c2804ee26592464b38e648384306b629d /libavcodec/mpegvideo.h | |
| parent | e9166b58aacaba353d4f261743f707feff582046 (diff) | |
| download | ffmpeg-b07a59805ed59800b5800d687a347eb15a9630dc.tar.gz | |
shape adaptive diamonds for EPZS
user specified amount of MV predictors from the last frame
b frame MV predictor scaling fixed
Originally committed as revision 1384 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 82fc9c4aaa..51370bab5a 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -150,8 +150,8 @@ typedef struct MotionEstContext{ int (*motion_search[7])(struct MpegEncContext * s, int block, int *mx_ptr, int *my_ptr, int P[10][2], int pred_x, int pred_y, - int xmin, int ymin, int xmax, int ymax, Picture *ref_picture, - uint16_t * const mv_penalty); + int xmin, int ymin, int xmax, int ymax, Picture *ref_picture, int16_t (*last_mv)[2], + int ref_mv_scale, uint16_t * const mv_penalty); }MotionEstContext; typedef struct MpegEncContext { @@ -369,7 +369,7 @@ typedef struct MpegEncContext { int resync_mb_x; /* x position of last resync marker */ int resync_mb_y; /* y position of last resync marker */ - GetBitContext last_resync_gb; /* used to serach for the next resync marker */ + GetBitContext last_resync_gb; /* used to search for the next resync marker */ int mb_num_left; /* number of MBs left in this video packet (for partitioned Slices only)*/ int next_p_frame_damaged; /* set if the next p frame is damaged, to avoid showing trashed b frames */ int error_resilience; |