diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 17:06:05 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 17:08:32 -0300 |
| commit | bfab4308560c277d754c214210758a865fcc7348 (patch) | |
| tree | 609493b886bed4b8a94bf89a6b8cad269224fb3b /libavcodec/mpegvideo.h | |
| parent | fb41bad7e051240017bc4cc79c50ea36ac12b96c (diff) | |
| parent | 94eed68ace9f2416af8457fcbf142b175928c06b (diff) | |
Merge commit '94eed68ace9f2416af8457fcbf142b175928c06b'
* commit '94eed68ace9f2416af8457fcbf142b175928c06b':
lavc: Drop deprecated options moved to private contexts
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index e9eb633d1b..6f20336bb5 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -252,9 +252,6 @@ typedef struct MpegEncContext { int16_t (*b_field_mv_table[2][2][2])[2];///< MV table (4MV per MB) interlaced B-frame encoding uint8_t (*p_field_select_table[2]); uint8_t (*b_field_select_table[2][2]); -#if FF_API_MOTION_EST - int me_method; ///< ME algorithm -#endif int motion_est; ///< ME algorithm int me_penalty_compensation; int me_pre; ///< prepass for motion estimation |