Merged.
On Wed, Jun 26, 2024 at 1:06 AM Frank Plowman <p...@frankplowman.com> wrote:
> Signed-off-by: Frank Plowman <p...@frankplowman.com>
> ---
> libavcodec/vvc/thread.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/libavcodec/vvc/thread.c b/libavcodec/vvc/thread.c
> index c90c316661..118d56b67e 100644
> --- a/libavcodec/vvc/thread.c
> +++ b/libavcodec/vvc/thread.c
> @@ -443,8 +443,11 @@ static int run_inter(VVCContext *s, VVCLocalContext
> *lc, VVCTask *t)
> {
> VVCFrameContext *fc = lc->fc;
> const CTU *ctu = fc->tab.ctus + t->rs;
> + int ret;
>
> - ff_vvc_predict_inter(lc, t->rs);
> + ret = ff_vvc_predict_inter(lc, t->rs);
> + if (ret < 0)
> + return ret;
>
> if (ctu->has_dmvr)
> report_frame_progress(fc, t->ry, VVC_PROGRESS_MV);
> @@ -454,9 +457,7 @@ static int run_inter(VVCContext *s, VVCLocalContext
> *lc, VVCTask *t)
>
> static int run_recon(VVCContext *s, VVCLocalContext *lc, VVCTask *t)
> {
> - ff_vvc_reconstruct(lc, t->rs, t->rx, t->ry);
> -
> - return 0;
> + return ff_vvc_reconstruct(lc, t->rs, t->rx, t->ry);
> }
>
> static int run_lmcs(VVCContext *s, VVCLocalContext *lc, VVCTask *t)
> --
> 2.45.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-requ...@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-requ...@ffmpeg.org with subject "unsubscribe".
