Message ID | 20240513073859.26731-2-nowrep@gmail.com |
---|---|
State | Accepted |
Commit | f7a1453f27583c36a3417c4a731b45ac4235b660 |
Headers | show |
Series | [FFmpeg-devel,v2] lavc/vaapi_decode: Reject decoding of frames with no slices | expand |
On Ma, 2024-05-13 at 09:38 +0200, David Rosca wrote: > Matches other hwaccels. > --- > v2: AVERROR > > libavcodec/vaapi_decode.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c > index 8e9f647c20..7c91d50f7b 100644 > --- a/libavcodec/vaapi_decode.c > +++ b/libavcodec/vaapi_decode.c > @@ -157,6 +157,11 @@ int ff_vaapi_decode_issue(AVCodecContext *avctx, > VAStatus vas; > int err; > > + if (pic->nb_slices <= 0) { > + err = AVERROR(EINVAL); > + goto fail; > + } > + > av_log(avctx, AV_LOG_DEBUG, "Decode to surface %#x.\n", > pic->output_surface); > LGTM, will apply Thanks Haihao
diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 8e9f647c20..7c91d50f7b 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -157,6 +157,11 @@ int ff_vaapi_decode_issue(AVCodecContext *avctx, VAStatus vas; int err; + if (pic->nb_slices <= 0) { + err = AVERROR(EINVAL); + goto fail; + } + av_log(avctx, AV_LOG_DEBUG, "Decode to surface %#x.\n", pic->output_surface);