[FFmpeg-devel] [PATCH] avcodec/vvc/inter: Don't return void

[FFmpeg-devel] [PATCH] avcodec/vvc/inter: Don't return void

[Andreas Rheinhardt]

Returning a void is not allowed by the spec. Just return instead.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 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;
-- 
2.40.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avcodec/vvc/inter: Don't return void

[Nuo Mi]

LGTM.
Thank you, Andreas

On Mon, Jun 10, 2024 at 1:37 PM Andreas Rheinhardt <
andreas.rheinhardt@outlook.com> wrote:

> Returning a void is not allowed by the spec. Just return instead.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  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;
> --
> 2.40.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".