avcodec: fix bug using new libavcodec encoder api

1 files changed, 15 insertions, 9 deletions

diff --git a/modules/avcodec/encode.c b/modules/avcodec/encode.c
index ae51415..bc1dc45 100644
--- a/modules/avcodec/encode.c
+++ b/modules/avcodec/encode.c
@@ -643,23 +643,29 @@ int encode(struct videnc_state *st, bool update, const struct vidframe *frame)
 
 #if LIBAVCODEC_VERSION_INT >= ((57<<16)+(37<<8)+100)
 	do {
-		AVPacket avpkt;
-
-		av_init_packet(&avpkt);
-
-		avpkt.data = st->mb->buf;
-		avpkt.size = (int)st->mb->size;
+		AVPacket *pkt;
 
 		ret = avcodec_send_frame(st->ctx, st->pict);
 		if (ret < 0)
 			return EBADMSG;
 
-		ret = avcodec_receive_packet(st->ctx, &avpkt);
-		if (ret < 0)
+		pkt = av_packet_alloc();
+		if (!pkt)
+			return ENOMEM;
+
+		ret = avcodec_receive_packet(st->ctx, pkt);
+		if (ret < 0) {
+			av_packet_free(&pkt);
 			return 0;
+		}
 
-		mbuf_set_end(st->mb, avpkt.size);
+		err = mbuf_write_mem(st->mb, pkt->data, pkt->size);
+		st->mb->pos = 0;
 
+		av_packet_free(&pkt);
+
+		if (err)
+			return err;
 	} while (0);
 #elif LIBAVCODEC_VERSION_INT >= ((54<<16)+(1<<8)+0)
 	do {