diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-26 10:02:28 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-04-27 10:43:06 -0300 |
| commit | e1e975869dfd6f77f606e0ad00006432d3fc8af7 (patch) | |
| tree | 5c0e0ec01f54a1c0b32c059266c0f29a876b80d4 | |
| parent | e3d993fab0ad4255dffd10a794fc5e1bd37047b7 (diff) | |
| download | ffmpeg-e1e975869dfd6f77f606e0ad00006432d3fc8af7.tar.gz | |
avcodec/mpegvideo: Remove deprecated rc_strategy option
Deprecated in d05c3b9ceeb9d00d4500c376448230e45f6ab108.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/mpegvideo.h | 12 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
2 files changed, 0 insertions, 15 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 30dcf99188..75e343838a 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -369,9 +369,6 @@ typedef struct MpegEncContext { uint8_t *mb_info_ptr; int mb_info_size; int ehc_mode; -#if FF_API_MPV_RC_STRATEGY - int rc_strategy; ///< deprecated -#endif /* H.263+ specific */ int umvplus; ///< == H.263+ && unrestricted_mv @@ -617,14 +614,6 @@ typedef struct MpegEncContext { #ifndef FF_MPV_OFFSET #define FF_MPV_OFFSET(x) offsetof(MpegEncContext, x) #endif -#if FF_API_MPV_RC_STRATEGY -#define FF_MPV_RC_STRATEGY_OPTS \ -{"rc_strategy", "ratecontrol method", FF_MPV_OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED, "rc_strategy" }, \ - { "ffmpeg", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED, "rc_strategy" }, \ - { "xvid", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED, "rc_strategy" }, -#else -#define FF_MPV_RC_STRATEGY_OPTS -#endif #define FF_MPV_OPT_FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) #define FF_MPV_COMMON_OPTS \ FF_MPV_OPT_CMP_FUNC, \ @@ -672,7 +661,6 @@ FF_MPV_OPT_CMP_FUNC, \ {"mepc", "Motion estimation bitrate penalty compensation (1.0 = 256)", FF_MPV_OFFSET(me_penalty_compensation), AV_OPT_TYPE_INT, {.i64 = 256 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"mepre", "pre motion estimation", FF_MPV_OFFSET(me_pre), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"intra_penalty", "Penalty for intra blocks in block decision", FF_MPV_OFFSET(intra_penalty), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX/2, FF_MPV_OPT_FLAGS }, \ -FF_MPV_RC_STRATEGY_OPTS #define FF_MPV_COMMON_BFRAME_OPTS \ {"b_strategy", "Strategy to choose between I/P/B-frames", FF_MPV_OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 2, FF_MPV_OPT_FLAGS }, \ diff --git a/libavcodec/version.h b/libavcodec/version.h index 35807f8e31..f5780bd8aa 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -69,9 +69,6 @@ #ifndef FF_API_OLD_ENCDEC #define FF_API_OLD_ENCDEC (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_MPV_RC_STRATEGY -#define FF_API_MPV_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_PARSER_CHANGE #define FF_API_PARSER_CHANGE (LIBAVCODEC_VERSION_MAJOR < 59) #endif |