[FFmpeg-cvslog] avcodec/vvc/inter: Don't return void
Andreas Rheinhardt
git at videolan.org
Tue Jun 11 03:43:37 EEST 2024
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Jun 10 06:45:08 2024 +0200| [a0ff31e740ec05e947ee0759c9f805a8894586ff] | committer: Andreas Rheinhardt
avcodec/vvc/inter: Don't return void
Returning a void is not allowed by the spec. Just return instead.
Reviewed-by: Nuo Mi <nuomi2021 at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0ff31e740ec05e947ee0759c9f805a8894586ff
---
libavcodec/vvc/inter.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/libavcodec/vvc/inter.c b/libavcodec/vvc/inter.c
index 98cb43322f..aaf3230c1e 100644
--- a/libavcodec/vvc/inter.c
+++ b/libavcodec/vvc/inter.c
@@ -146,18 +146,21 @@ static void emulated_edge(const VVCLocalContext *lc, uint8_t *dst,
subpic_get_rect(&subpic, src_frame, subpic_idx, is_chroma);
if (!wrap_enabled || (dmvr_left >= 0 && dmvr_right <= pic_width)) {
- return emulated_edge_no_wrap(lc, dst, src, src_stride,
+ emulated_edge_no_wrap(lc, dst, src, src_stride,
x_off, y_off, block_w, block_h, extra_before, extra_after, &subpic, &sb, dmvr_clip);
+ return;
}
if (dmvr_right <= 0) {
sb_wrap(&sb, wrap);
- return emulated_edge_no_wrap(lc, dst, src, src_stride,
+ emulated_edge_no_wrap(lc, dst, src, src_stride,
x_off + wrap, y_off, block_w, block_h, extra_before, extra_after, &subpic, &sb, dmvr_clip);
+ return;
}
if (dmvr_left >= pic_width) {
sb_wrap(&sb, -wrap);
- return emulated_edge_no_wrap(lc, dst, src, src_stride,
+ emulated_edge_no_wrap(lc, dst, src, src_stride,
x_off - wrap, y_off, block_w, block_h, extra_before, extra_after, &subpic, &sb, dmvr_clip);
+ return;
}
block_w += extra;
More information about the ffmpeg-cvslog
mailing list