[FFmpeg-cvslog] avcodec/nvenc: also clear data pointer after unregistering a resource

[Timo Rothenpieler]

ffmpeg | branch: release/3.3 | Timo Rothenpieler  | Sun 
Jan 28 13:05:09 2018 +0100| [dfd2f4ee265e8027bf425424145396e6dc5e184e] | 
committer: Timo Rothenpieler

avcodec/nvenc: also clear data pointer after unregistering a resource

Signed-off-by: Timo Rothenpieler 

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

 libavcodec/nvenc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index 5bc97835d6..5185342a7f 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -1424,6 +1424,7 @@ static int nvenc_find_free_reg_resource(AVCodecContext 
*avctx)
 nv_status = 
p_nvenc->nvEncUnregisterResource(ctx->nvencoder, 
ctx->registered_frames[i].regptr);
 if (nv_status != NV_ENC_SUCCESS)
 return nvenc_print_error(avctx, nv_status, "Failed 
unregistering unused input resource");
+ctx->registered_frames[i].ptr = 0;
 ctx->registered_frames[i].regptr = NULL;
 }
 return i;
@@ -1682,6 +1683,7 @@ static int process_output_surface(AVCodecContext *avctx, 
AVPacket *pkt, NvencSur
 res = nvenc_print_error(avctx, nv_status, "Failed 
unregistering input resource");
 goto error;
 }
+ctx->registered_frames[tmpoutsurf->reg_idx].ptr = 0;
 ctx->registered_frames[tmpoutsurf->reg_idx].regptr = NULL;
 } else if (ctx->registered_frames[tmpoutsurf->reg_idx].mapped < 0) {
 res = AVERROR_BUG;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/nvenc: also clear data pointer after unregistering a resource

[Timo Rothenpieler]

ffmpeg | branch: release/3.4 | Timo Rothenpieler  | Sun 
Jan 28 13:05:09 2018 +0100| [93c8720b914e7027d0e6401e6f64a9a4ce531d0c] | 
committer: Timo Rothenpieler

avcodec/nvenc: also clear data pointer after unregistering a resource

Signed-off-by: Timo Rothenpieler 

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

 libavcodec/nvenc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index 43d2549fb5..d36fa2951b 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -1493,6 +1493,7 @@ static int nvenc_find_free_reg_resource(AVCodecContext 
*avctx)
 nv_status = 
p_nvenc->nvEncUnregisterResource(ctx->nvencoder, 
ctx->registered_frames[i].regptr);
 if (nv_status != NV_ENC_SUCCESS)
 return nvenc_print_error(avctx, nv_status, "Failed 
unregistering unused input resource");
+ctx->registered_frames[i].ptr = 0;
 ctx->registered_frames[i].regptr = NULL;
 }
 return i;
@@ -1751,6 +1752,7 @@ static int process_output_surface(AVCodecContext *avctx, 
AVPacket *pkt, NvencSur
 res = nvenc_print_error(avctx, nv_status, "Failed 
unregistering input resource");
 goto error;
 }
+ctx->registered_frames[tmpoutsurf->reg_idx].ptr = 0;
 ctx->registered_frames[tmpoutsurf->reg_idx].regptr = NULL;
 } else if (ctx->registered_frames[tmpoutsurf->reg_idx].mapped < 0) {
 res = AVERROR_BUG;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/nvenc: also clear data pointer after unregistering a resource

[Timo Rothenpieler]

ffmpeg | branch: master | Timo Rothenpieler  | Sun Jan 
28 13:05:09 2018 +0100| [932037c6bb6b41a24e75b031426844a2e6472a74] | committer: 
Timo Rothenpieler

avcodec/nvenc: also clear data pointer after unregistering a resource

Signed-off-by: Timo Rothenpieler 

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

 libavcodec/nvenc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index 7038a49d90..39c3aa1fbb 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -1540,6 +1540,7 @@ static int nvenc_find_free_reg_resource(AVCodecContext 
*avctx)
 nv_status = 
p_nvenc->nvEncUnregisterResource(ctx->nvencoder, 
ctx->registered_frames[i].regptr);
 if (nv_status != NV_ENC_SUCCESS)
 return nvenc_print_error(avctx, nv_status, "Failed 
unregistering unused input resource");
+ctx->registered_frames[i].ptr = NULL;
 ctx->registered_frames[i].regptr = NULL;
 }
 return i;
@@ -1810,6 +1811,7 @@ static int process_output_surface(AVCodecContext *avctx, 
AVPacket *pkt, NvencSur
 res = nvenc_print_error(avctx, nv_status, "Failed 
unregistering input resource");
 goto error;
 }
+ctx->registered_frames[tmpoutsurf->reg_idx].ptr = NULL;
 ctx->registered_frames[tmpoutsurf->reg_idx].regptr = NULL;
 } else if (ctx->registered_frames[tmpoutsurf->reg_idx].mapped < 0) {
 res = AVERROR_BUG;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog