diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-12-03 13:16:13 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-12-11 09:27:40 +0100 |
| commit | a6901b9c6bd51396c1159f1a07f9f5042328cda6 (patch) | |
| tree | 5b0b328275737835e923f5903e7bfca206d9bded /libavcodec/mpegvideo.h | |
| parent | ac648bb835edd3f67bda2267d0e72e5e582eb5a1 (diff) | |
| download | ffmpeg-a6901b9c6bd51396c1159f1a07f9f5042328cda6.tar.gz | |
Drop libxvid rate control support for mpegvideo encoding
The feature has outlived is usefulness and complicates the code.
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 932a6f2b34..f096b8a0fa 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -356,7 +356,6 @@ typedef struct MpegEncContext { int prev_mb_info, last_mb_info; uint8_t *mb_info_ptr; int mb_info_size; - int rc_strategy; /* H.263+ specific */ int umvplus; ///< == H.263+ && unrestricted_mv @@ -602,8 +601,7 @@ FF_MPV_OPT_CMP_FUNC, \ {"lmax", "maximum Lagrange factor (VBR)", FF_MPV_OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 31*FF_QP2LAMBDA }, 0, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"ibias", "intra quant bias", FF_MPV_OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"pbias", "inter quant bias", FF_MPV_OFFSET(inter_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ -{"rc_strategy", "ratecontrol method", FF_MPV_OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS }, \ -{"motion_est", "motion estimation algorithm", FF_MPV_OFFSET(motion_est), AV_OPT_TYPE_INT, {.i64 = FF_ME_EPZS }, FF_ME_ZERO, FF_ME_XONE, FF_MPV_OPT_FLAGS, "motion_est" }, \ +{"motion_est", "motion estimation algorithm", FF_MPV_OFFSET(motion_est), AV_OPT_TYPE_INT, {.i64 = FF_ME_EPZS }, FF_ME_ZERO, FF_ME_XONE, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "zero", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ZERO }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "epzs", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_EPZS }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "xone", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_XONE }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ |