From e0c2c77c2ab1fcd65b18a4c8c71b34b2b8652900 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 22 Mar 2013 07:05:00 +0100 Subject: ffmpeg decoder plugin: do not allocate an AVFrame on stack. AVFrame must be allocated with avcodec_alloc_frame(). --- NEWS | 1 + src/decoder/ffmpeg_decoder_plugin.c | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 7fa7dc035..ea746b9c8 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ ver 0.17.4 (2013/??/??) - allow to omit END in ranges (START:END) * decoder: - ffmpeg: support float planar audio (ffmpeg 1.1) + - ffmpeg: fix AVFrame allocation * player: - implement missing "idle" events on output errors * clock: fix build failure diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c index 4c4cb2b81..fcf7507f4 100644 --- a/src/decoder/ffmpeg_decoder_plugin.c +++ b/src/decoder/ffmpeg_decoder_plugin.c @@ -318,20 +318,33 @@ ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is, cmd == DECODE_COMMAND_NONE) { int audio_size = buffer_size; #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,25,0) - AVFrame frame; + + AVFrame *frame = avcodec_alloc_frame(); + if (frame == NULL) { + g_warning("Could not allocate frame"); + break; + } + int got_frame = 0; int len = avcodec_decode_audio4(codec_context, - &frame, &got_frame, + frame, &got_frame, &packet2); if (len >= 0 && got_frame) { audio_size = copy_interleave_frame(codec_context, - &frame, + frame, aligned_buffer, buffer_size); if (audio_size < 0) len = audio_size; } else if (len >= 0) len = -1; + +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0) + avcodec_free_frame(&frame); +#else + av_freep(&frame); +#endif + #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,0) int len = avcodec_decode_audio3(codec_context, aligned_buffer, &audio_size, -- cgit v1.2.3