diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-05-04 15:30:01 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-06-12 13:20:47 +0200 |
| commit | bf8208d0cd7c429e227c7e7f644076e272f51d55 (patch) | |
| tree | 96f3a582b63cff4ce732f77c95fd4554d06a3cf6 /libavcodec | |
| parent | f0c021b6ffbb817f2e91e7bf98d82249304c0ecc (diff) | |
| download | ffmpeg-bf8208d0cd7c429e227c7e7f644076e272f51d55.tar.gz | |
avcodec/mpegvideo_enc: Make ff_dct_quantize_c() static
Only used here.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 13 | ||||
| -rw-r--r-- | libavcodec/mpegvideoenc.h | 1 |
2 files changed, 8 insertions, 6 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 42eccabf1b..4d467178bb 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -88,6 +88,9 @@ static int encode_picture(MpegEncContext *s, const AVPacket *pkt); static int dct_quantize_refine(MpegEncContext *s, int16_t *block, int16_t *weight, int16_t *orig, int n, int qscale); static int sse_mb(MpegEncContext *s); static void denoise_dct_c(MpegEncContext *s, int16_t *block); +static int dct_quantize_c(MpegEncContext *s, + int16_t *block, int n, + int qscale, int *overflow); static int dct_quantize_trellis_c(MpegEncContext *s, int16_t *block, int n, int qscale, int *overflow); static uint8_t default_mv_penalty[MAX_FCODE + 1][MAX_DMV * 2 + 1]; @@ -297,7 +300,7 @@ av_cold int ff_dct_encode_init(MpegEncContext *s) if (CONFIG_H263_ENCODER) ff_h263dsp_init(&s->h263dsp); if (!s->dct_quantize) - s->dct_quantize = ff_dct_quantize_c; + s->dct_quantize = dct_quantize_c; if (!s->denoise_dct) s->denoise_dct = denoise_dct_c; s->fast_dct_quantize = s->dct_quantize; @@ -2425,7 +2428,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, } // non c quantize code returns incorrect block_last_index FIXME - if (s->alternate_scan && s->dct_quantize != ff_dct_quantize_c) { + if (s->alternate_scan && s->dct_quantize != dct_quantize_c) { for (i = 0; i < mb_block_count; i++) { int j; if (s->block_last_index[i] > 0) { @@ -4554,9 +4557,9 @@ void ff_block_permute(int16_t *block, const uint8_t *permutation, } } -int ff_dct_quantize_c(MpegEncContext *s, - int16_t *block, int n, - int qscale, int *overflow) +static int dct_quantize_c(MpegEncContext *s, + int16_t *block, int n, + int qscale, int *overflow) { int i, j, level, last_non_zero, q, start_i; const int *qmat; diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index f7e681eaa6..ae916f163e 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -148,7 +148,6 @@ void ff_write_quant_matrix(PutBitContext *pb, uint16_t *matrix); int ff_dct_encode_init(MpegEncContext *s); void ff_dct_encode_init_x86(MpegEncContext *s); -int ff_dct_quantize_c(MpegEncContext *s, int16_t *block, int n, int qscale, int *overflow); void ff_convert_matrix(MpegEncContext *s, int (*qmat)[64], uint16_t (*qmat16)[2][64], const uint16_t *quant_matrix, int bias, int qmin, int qmax, int intra); |