diff mbox series

[FFmpeg-devel,7/7] avcodec/mpegvideo_enc: Don't pretend ff_dct_encode_init() can fail

Message ID AS8P250MB0744D01A8B11223A2B334CA98FC52@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
State New
Headers show
Series [FFmpeg-devel,1/7] avcodec/dnxhdenc: Remove always-false check | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Andreas Rheinhardt June 9, 2024, 9:54 a.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/mpegvideo_enc.c | 4 +---
 libavcodec/mpegvideoenc.h  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

Comments

Rémi Denis-Courmont June 9, 2024, 10:12 a.m. UTC | #1 
I would have reordered the code to avoid forward declarations, but LGTM.
diff mbox series

Patch

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index b7c1f08b0f..46ef693abe 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -290,7 +290,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;
@@ -303,8 +303,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 abbcdbc8fa..0a9e65e93a 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);