Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH] avcodec/vp8: Return error on error
@ 2024-04-27 11:12 Andreas Rheinhardt
  2024-04-27 13:45 ` Ronald S. Bultje
  0 siblings, 1 reply; 2+ messages in thread
From: Andreas Rheinhardt @ 2024-04-27 11:12 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Andreas Rheinhardt

Regression since e1ba00ac8f755f37ebc8448d3dbea906d7b79da2.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/vp8.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index f37938ad27..19f32b3400 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -107,8 +107,11 @@ static int vp8_alloc_frame(VP8Context *s, VP8Frame *f, int ref)
                                            ref ? AV_GET_BUFFER_FLAG_REF : 0);
     if (ret < 0)
         return ret;
-    if (!(f->seg_map = ff_refstruct_allocz(s->mb_width * s->mb_height)))
+    f->seg_map = ff_refstruct_allocz(s->mb_width * s->mb_height);
+    if (!f->seg_map) {
+        ret = AVERROR(ENOMEM);
         goto fail;
+    }
     ret = ff_hwaccel_frame_priv_alloc(s->avctx, &f->hwaccel_picture_private);
     if (ret < 0)
         goto fail;
-- 
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".

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [FFmpeg-devel] [PATCH] avcodec/vp8: Return error on error
  2024-04-27 11:12 [FFmpeg-devel] [PATCH] avcodec/vp8: Return error on error Andreas Rheinhardt
@ 2024-04-27 13:45 ` Ronald S. Bultje
  0 siblings, 0 replies; 2+ messages in thread
From: Ronald S. Bultje @ 2024-04-27 13:45 UTC (permalink / raw)
  To: FFmpeg development discussions and patches; +Cc: Andreas Rheinhardt

Hi,

On Sat, Apr 27, 2024 at 7:47 AM Andreas Rheinhardt <
andreas.rheinhardt@outlook.com> wrote:

> Regression since e1ba00ac8f755f37ebc8448d3dbea906d7b79da2.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/vp8.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
> index f37938ad27..19f32b3400 100644
> --- a/libavcodec/vp8.c
> +++ b/libavcodec/vp8.c
> @@ -107,8 +107,11 @@ static int vp8_alloc_frame(VP8Context *s, VP8Frame
> *f, int ref)
>                                             ref ? AV_GET_BUFFER_FLAG_REF :
> 0);
>      if (ret < 0)
>          return ret;
> -    if (!(f->seg_map = ff_refstruct_allocz(s->mb_width * s->mb_height)))
> +    f->seg_map = ff_refstruct_allocz(s->mb_width * s->mb_height);
> +    if (!f->seg_map) {
> +        ret = AVERROR(ENOMEM);
>          goto fail;
> +    }
>      ret = ff_hwaccel_frame_priv_alloc(s->avctx,
> &f->hwaccel_picture_private);
>      if (ret < 0)
>          goto fail;
> --
> 2.40.1
>

OK.

Ronald
_______________________________________________
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".

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-04-27 13:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-27 11:12 [FFmpeg-devel] [PATCH] avcodec/vp8: Return error on error Andreas Rheinhardt
2024-04-27 13:45 ` Ronald S. Bultje

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git