avcodec/nvenc: make sure newly allocated packets are refcounted

BtbN · BtbN · commit 5d33a4d33034 · 2019-11-17T01:27:44.000+01:00
Fixes ticket 8383.

Signed-off-by: Timo Rothenpieler &lt;timo@rothenpieler.org&gt;
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
@@ -1881,7 +1881,11 @@ static int process_output_surface(AVCodecContext *avctx, AVPacket *pkt, NvencSur
         goto error;
     }
 
-    if (res = ff_alloc_packet2(avctx, pkt, lock_params.bitstreamSizeInBytes,0)) {
+    res = pkt->data ?
+        ff_alloc_packet2(avctx, pkt, lock_params.bitstreamSizeInBytes, lock_params.bitstreamSizeInBytes) :
+        av_new_packet(pkt, lock_params.bitstreamSizeInBytes);
+
+    if (res < 0) {
         p_nvenc->nvEncUnlockBitstream(ctx->nvencoder, tmpoutsurf->output_surface);
         goto error;
     }

Original file line number	Diff line number	Diff line change
`@@ -1881,7 +1881,11 @@ static int process_output_surface(AVCodecContext avctx, AVPacket pkt, NvencSur`
`1881`	`1881`	`goto error;`
`1882`	`1882`	`}`
`1883`	`1883`
`1884`		`- if (res = ff_alloc_packet2(avctx, pkt, lock_params.bitstreamSizeInBytes,0)) {`
	`1884`	`+ res = pkt->data ?`
	`1885`	`+ ff_alloc_packet2(avctx, pkt, lock_params.bitstreamSizeInBytes, lock_params.bitstreamSizeInBytes) :`
	`1886`	`+ av_new_packet(pkt, lock_params.bitstreamSizeInBytes);`
	`1887`	`+`
	`1888`	`+ if (res < 0) {`
`1885`	`1889`	`p_nvenc->nvEncUnlockBitstream(ctx->nvencoder, tmpoutsurf->output_surface);`
`1886`	`1890`	`goto error;`
`1887`	`1891`	`}`