[FFmpeg-cvslog] lavc/vaapi_decode: Don't update buffer number if allocataion fail

Fei Wang git at videolan.org
Mon Mar 18 08:04:48 EET 2024


ffmpeg | branch: master | Fei Wang <fei.w.wang at intel.com> | Thu Mar 14 08:38:05 2024 +0800| [8962e2b1aa1d0a6f5c03bf119e7f880a3e6c6c09] | committer: Haihao Xiang

lavc/vaapi_decode: Don't update buffer number if allocataion fail

Signed-off-by: Fei Wang <fei.w.wang at intel.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8962e2b1aa1d0a6f5c03bf119e7f880a3e6c6c09
---

 libavcodec/vaapi_decode.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c
index ceac769c52..cca94b5336 100644
--- a/libavcodec/vaapi_decode.c
+++ b/libavcodec/vaapi_decode.c
@@ -72,17 +72,14 @@ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
 
     av_assert0(pic->nb_slices <= pic->slices_allocated);
     if (pic->nb_slices == pic->slices_allocated) {
-        if (pic->slices_allocated > 0)
-            pic->slices_allocated *= 2;
-        else
-            pic->slices_allocated = 64;
-
         pic->slice_buffers =
             av_realloc_array(pic->slice_buffers,
-                             pic->slices_allocated,
+                             pic->slices_allocated ? pic->slices_allocated * 2 : 64,
                              2 * sizeof(*pic->slice_buffers));
         if (!pic->slice_buffers)
             return AVERROR(ENOMEM);
+
+        pic->slices_allocated = pic->slices_allocated ? pic->slices_allocated * 2 : 64;
     }
     av_assert0(pic->nb_slices + 1 <= pic->slices_allocated);
 



More information about the ffmpeg-cvslog mailing list