Re: [FFmpeg-devel] [PATCH v5 4/8] lavc/vaapi_encode: Init pic at the beginning of API

[Neal Gompa]

On Mon, Sep 11, 2023 at 3:53 AM  wrote:
>
> From: Fei Wang 
>
> Signed-off-by: Fei Wang 
> ---
>  libavcodec/vaapi_encode.c | 5 +
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
> index 0316fe5c18..5ae63c9f25 100644
> --- a/libavcodec/vaapi_encode.c
> +++ b/libavcodec/vaapi_encode.c
> @@ -1205,7 +1205,7 @@ fail:
>  int ff_vaapi_encode_receive_packet(AVCodecContext *avctx, AVPacket *pkt)
>  {
>  VAAPIEncodeContext *ctx = avctx->priv_data;
> -VAAPIEncodePicture *pic;
> +VAAPIEncodePicture *pic = NULL;
>  AVFrame *frame = ctx->frame;
>  int err;
>
> @@ -1228,8 +1228,6 @@ int ff_vaapi_encode_receive_packet(AVCodecContext 
> *avctx, AVPacket *pkt)
>  }
>
>  if (ctx->has_sync_buffer_func) {
> -pic = NULL;
> -
>  if (av_fifo_can_write(ctx->encode_fifo)) {
>  err = vaapi_encode_pick_next(avctx, );
>  if (!err) {
> @@ -1255,7 +1253,6 @@ int ff_vaapi_encode_receive_packet(AVCodecContext 
> *avctx, AVPacket *pkt)
>  av_fifo_read(ctx->encode_fifo, , 1);
>  ctx->encode_order = pic->encode_order + 1;
>  } else {
> -pic = NULL;
>  err = vaapi_encode_pick_next(avctx, );
>  if (err < 0)
>  return err;
> --
> 2.25.1
>

LGTM and existing VAAPI stuff works.

Reviewed-by: Neal Gompa 



-- 
真実はいつも一つ！/ Always, there's only one truth!
___
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] [PATCH v5 4/8] lavc/vaapi_encode: Init pic at the beginning of API

[fei . w . wang-at-intel . com]

From: Fei Wang 

Signed-off-by: Fei Wang 
---
 libavcodec/vaapi_encode.c | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
index 0316fe5c18..5ae63c9f25 100644
--- a/libavcodec/vaapi_encode.c
+++ b/libavcodec/vaapi_encode.c
@@ -1205,7 +1205,7 @@ fail:
 int ff_vaapi_encode_receive_packet(AVCodecContext *avctx, AVPacket *pkt)
 {
 VAAPIEncodeContext *ctx = avctx->priv_data;
-VAAPIEncodePicture *pic;
+VAAPIEncodePicture *pic = NULL;
 AVFrame *frame = ctx->frame;
 int err;
 
@@ -1228,8 +1228,6 @@ int ff_vaapi_encode_receive_packet(AVCodecContext *avctx, 
AVPacket *pkt)
 }
 
 if (ctx->has_sync_buffer_func) {
-pic = NULL;
-
 if (av_fifo_can_write(ctx->encode_fifo)) {
 err = vaapi_encode_pick_next(avctx, );
 if (!err) {
@@ -1255,7 +1253,6 @@ int ff_vaapi_encode_receive_packet(AVCodecContext *avctx, 
AVPacket *pkt)
 av_fifo_read(ctx->encode_fifo, , 1);
 ctx->encode_order = pic->encode_order + 1;
 } else {
-pic = NULL;
 err = vaapi_encode_pick_next(avctx, );
 if (err < 0)
 return err;
-- 
2.25.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".