From 0b670a7f915fd4fa86444da7c24f325d651b16bd Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Tue, 21 Dec 2021 21:23:00 +0100 Subject: avcodec/mjpegenc: Use custom close function directly Currently, ff_mpv_encode_end() is the close function of the two MJPEG-based encoders; it calls ff_mjpeg_encode_close() for them which adds a check to the generic code. This commit reverses the order of this relationship: The MJPEG encoders directly use a custom close function which in turn calls ff_mpv_encode_end(). This avoids the branch in ff_mpv_encode_end() and makes the generic code more generic. Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegenc.h | 1 - 1 file changed, 1 deletion(-) (limited to 'libavcodec/mjpegenc.h') diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h index 2e92511276..bc9b017e7a 100644 --- a/libavcodec/mjpegenc.h +++ b/libavcodec/mjpegenc.h @@ -105,7 +105,6 @@ static inline void put_marker(PutBitContext *p, enum JpegMarker code) } int ff_mjpeg_encode_init(MpegEncContext *s); -void ff_mjpeg_encode_close(MpegEncContext *s); void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[12][64]); int ff_mjpeg_encode_stuffing(MpegEncContext *s); -- cgit v1.2.3