Andreas Rheinhardt:
> The user-provided value is overwritten in ff_mpv_encode_init()
> without having ever been read.
> (This has been broken when making these options mpegvideo-specific
> in commits 910247f1720c6aae422723c05dac6d0b19f20bec and
> cf7d2f2d2134c0854edf2db91e7436ac2bc9874f. No one has ever complained,
> so this commit removes these fields.)
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
> ---
> libavcodec/mpegvideoenc.h | 4 ----
> libavcodec/version.h | 2 +-
> 2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h
> index a0e8913ea6..ecc389a6d3 100644
> --- a/libavcodec/mpegvideoenc.h
> +++ b/libavcodec/mpegvideoenc.h
> @@ -43,8 +43,6 @@
> #define FF_MPV_FLAG_NAQ 0x0010
> #define FF_MPV_FLAG_MV0 0x0020
>
> -#define FF_DEFAULT_QUANT_BIAS 999999
> -
> #define FF_MPV_OPT_CMP_FUNC \
> { "sad", "Sum of absolute differences, fast", 0, AV_OPT_TYPE_CONST, {.i64
> = FF_CMP_SAD }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
> { "sse", "Sum of squared errors", 0, AV_OPT_TYPE_CONST, {.i64 =
> FF_CMP_SSE }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
> @@ -94,8 +92,6 @@ FF_MPV_OPT_CMP_FUNC, \
> {"border_mask", "increase the quantizer for macroblocks close to borders",
> FF_MPV_OFFSET(border_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX,
> FLT_MAX, FF_MPV_OPT_FLAGS}, \
> {"lmin", "minimum Lagrange factor (VBR)",
> FF_MPV_OFFSET(lmin), AV_OPT_TYPE_INT, {.i64 = 2*FF_QP2LAMBDA }, 0, INT_MAX,
> FF_MPV_OPT_FLAGS }, \
> {"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 }, \
> {"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" }, \
> diff --git a/libavcodec/version.h b/libavcodec/version.h
> index 87b7284a95..5183deb68b 100644
> --- a/libavcodec/version.h
> +++ b/libavcodec/version.h
> @@ -29,7 +29,7 @@
>
> #include "version_major.h"
>
> -#define LIBAVCODEC_VERSION_MINOR 28
> +#define LIBAVCODEC_VERSION_MINOR 29
> #define LIBAVCODEC_VERSION_MICRO 100
>
> #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
Ping for the last four patches of this patchset. I plan to push them on
Sunday unless there are objections.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
