diff options
| author | Stian Selnes <stian@pexip.com> | 2014-03-21 10:10:14 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-04-29 09:07:33 +0200 |
| commit | 245be5651003110fb954766cd74de1630fbed288 (patch) | |
| tree | b3eddec53dec96bc211dcda50cbf96ed69496530 | |
| parent | 3a81f604fefa165164699f676c567bfc68d52b07 (diff) | |
avvidenc: Fix leak of AVBufferRef
AVPacket contains AVBufferRef which may leak unless unreffed properly.
https://bugzilla.gnome.org/show_bug.cgi?id=726814
| -rw-r--r-- | ext/libav/gstavvidenc.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c index 9a52c7f6b4..bbf3f0d4e9 100644 --- a/ext/libav/gstavvidenc.c +++ b/ext/libav/gstavvidenc.c @@ -542,6 +542,13 @@ gst_ffmpegvidenc_propose_allocation (GstVideoEncoder * encoder, query); } +static void +gst_ffmpegvidenc_free_avpacket (gpointer pkt) +{ + av_packet_unref ((AVPacket *)pkt); + g_slice_free (AVPacket, pkt); +} + static GstFlowReturn gst_ffmpegvidenc_handle_frame (GstVideoEncoder * encoder, GstVideoCodecFrame * frame) @@ -551,7 +558,7 @@ gst_ffmpegvidenc_handle_frame (GstVideoEncoder * encoder, gint ret = 0, c; GstVideoInfo *info = &ffmpegenc->input_state->info; GstVideoFrame vframe; - AVPacket pkt; + AVPacket * pkt; int have_data = 0; if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (frame)) @@ -579,14 +586,17 @@ gst_ffmpegvidenc_handle_frame (GstVideoEncoder * encoder, ffmpegenc->context->ticks_per_frame, ffmpegenc->context->time_base); have_data = 0; - memset (&pkt, 0, sizeof (pkt)); + pkt = g_slice_new0 (AVPacket); ret = - avcodec_encode_video2 (ffmpegenc->context, &pkt, ffmpegenc->picture, + avcodec_encode_video2 (ffmpegenc->context, pkt, ffmpegenc->picture, &have_data); gst_video_frame_unmap (&vframe); + if (ret < 0 || !have_data) + g_slice_free (AVPacket, pkt); + if (ret < 0) goto encode_fail; @@ -607,8 +617,8 @@ gst_ffmpegvidenc_handle_frame (GstVideoEncoder * encoder, frame = gst_video_encoder_get_oldest_frame (encoder); outbuf = - gst_buffer_new_wrapped_full (0, pkt.data, pkt.size, 0, pkt.size, pkt.data, - av_free); + gst_buffer_new_wrapped_full (0, pkt->data, pkt->size, 0, pkt->size, pkt, + gst_ffmpegvidenc_free_avpacket); frame->output_buffer = outbuf; /* buggy codec may not set coded_frame */ |