avcodec/mpegvideo_enc: Don't pretend ff_dct_encode_init() can fail

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
release/7.1
Andreas Rheinhardt 8 months ago
parent 1dc1b6c5af
commit 89742b88c6
  1. 4
      libavcodec/mpegvideo_enc.c
  2. 2
      libavcodec/mpegvideoenc.h

@ -291,7 +291,7 @@ static void mpv_encode_defaults(MpegEncContext *s)
s->picture_in_gop_number = 0;
}
av_cold int ff_dct_encode_init(MpegEncContext *s)
av_cold void ff_dct_encode_init(MpegEncContext *s)
{
s->dct_quantize = dct_quantize_c;
s->denoise_dct = denoise_dct_c;
@ -304,8 +304,6 @@ av_cold int ff_dct_encode_init(MpegEncContext *s)
if (s->avctx->trellis)
s->dct_quantize = dct_quantize_trellis_c;
return 0;
}
/* init video encoder */

@ -145,7 +145,7 @@ int ff_mpv_reallocate_putbitbuffer(MpegEncContext *s, size_t threshold, size_t s
void ff_write_quant_matrix(PutBitContext *pb, uint16_t *matrix);
int ff_dct_encode_init(MpegEncContext *s);
void ff_dct_encode_init(MpegEncContext *s);
void ff_mpvenc_dct_init_mips(MpegEncContext *s);
void ff_dct_encode_init_x86(MpegEncContext *s);

Loading…
Cancel
Save