ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@outlook.com> | Sat May 4 21:15:21 2024 +0200| [89742b88c609be8fa276bcbed40088215d1ebf1a] | committer: Andreas Rheinhardt
avcodec/mpegvideo_enc: Don't pretend ff_dct_encode_init() can fail Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89742b88c609be8fa276bcbed40088215d1ebf1a --- libavcodec/mpegvideo_enc.c | 4 +--- libavcodec/mpegvideoenc.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 6adcd483f4..eda2305630 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -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 */ diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index 465fb21657..f5044a0309 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
