@@ -751,7 +751,7 @@ static int quant_psnr8x8_c(MpegEncContext *s, const uint8_t *src1,
memcpy(bak, temp, 64 * sizeof(int16_t));
s->block_last_index[0 /* FIXME */] =
- s->fast_dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i);
+ s->dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i);
s->dct_unquantize_inter(s, temp, 0, s->qscale);
ff_simple_idct_int16_8bit(temp); // FIXME
@@ -779,7 +779,7 @@ static int rd8x8_c(MpegEncContext *s, const uint8_t *src1, const uint8_t *src2,
s->block_last_index[0 /* FIXME */] =
last =
- s->fast_dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i);
+ s->dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i);
bits = 0;
@@ -849,7 +849,7 @@ static int bit8x8_c(MpegEncContext *s, const uint8_t *src1, const uint8_t *src2,
s->block_last_index[0 /* FIXME */] =
last =
- s->fast_dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i);
+ s->dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i);
bits = 0;
@@ -496,7 +496,6 @@ typedef struct MpegEncContext {
void (*dct_unquantize_inter)(struct MpegEncContext *s, // unquantizer to use (MPEG-4 can use both)
int16_t *block/*align 16*/, int n, int qscale);
int (*dct_quantize)(struct MpegEncContext *s, int16_t *block/*align 16*/, int n, int qscale, int *overflow);
- int (*fast_dct_quantize)(struct MpegEncContext *s, int16_t *block/*align 16*/, int n, int qscale, int *overflow);
void (*denoise_dct)(struct MpegEncContext *s, int16_t *block);
int mpv_flags; ///< flags set by private options
@@ -301,7 +301,6 @@ av_cold int ff_dct_encode_init(MpegEncContext *s)
ff_dct_encode_init_x86(s);
#endif
- s->fast_dct_quantize = s->dct_quantize;
if (s->avctx->trellis)
s->dct_quantize = dct_quantize_trellis_c;
It has been added in 3a87ac948f0cd95218e62d5a98b8b8d5e4c11366, but there was never an implementation different from the ordinary dct_quantize of it. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/me_cmp.c | 6 +++--- libavcodec/mpegvideo.h | 1 - libavcodec/mpegvideo_enc.c | 1 - 3 files changed, 3 insertions(+), 5 deletions(-)