diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-09-21 11:09:01 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-09-24 14:31:24 +0400 |
commit | 9eb296572ec801c32d86b349ba1de27704953237 (patch) | |
tree | 365bb578d3510b4a8ba88c644f8d5aa0cd5e5db8 /libavformat/utils.c | |
parent | a42aadabc64f50124eece6e37e63eafa46e1a6ce (diff) |
lavf: use a malloced AVFrame in try_decode_frame().
This allows using avcodec_free_frame() to free it properly.
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r-- | libavformat/utils.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 9dd58cc152..9c6b1439c2 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2084,9 +2084,12 @@ static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **option { const AVCodec *codec; int got_picture = 1, ret = 0; - AVFrame picture; + AVFrame *frame = avcodec_alloc_frame(); AVPacket pkt = *avpkt; + if (!frame) + return AVERROR(ENOMEM); + if (!avcodec_is_open(st->codec) && !st->info->found_decoder) { AVDictionary *thread_opt = NULL; @@ -2095,7 +2098,8 @@ static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **option if (!codec) { st->info->found_decoder = -1; - return -1; + ret = -1; + goto fail; } /* force thread count to 1 since the h264 decoder will not extract SPS @@ -2106,14 +2110,16 @@ static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **option av_dict_free(&thread_opt); if (ret < 0) { st->info->found_decoder = -1; - return ret; + goto fail; } st->info->found_decoder = 1; } else if (!st->info->found_decoder) st->info->found_decoder = 1; - if (st->info->found_decoder < 0) - return -1; + if (st->info->found_decoder < 0) { + ret = -1; + goto fail; + } while ((pkt.size > 0 || (!pkt.data && got_picture)) && ret >= 0 && @@ -2121,14 +2127,14 @@ static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **option !has_decode_delay_been_guessed(st) || (!st->codec_info_nb_frames && st->codec->codec->capabilities & CODEC_CAP_CHANNEL_CONF))) { got_picture = 0; - avcodec_get_frame_defaults(&picture); + avcodec_get_frame_defaults(frame); switch(st->codec->codec_type) { case AVMEDIA_TYPE_VIDEO: - ret = avcodec_decode_video2(st->codec, &picture, + ret = avcodec_decode_video2(st->codec, frame, &got_picture, &pkt); break; case AVMEDIA_TYPE_AUDIO: - ret = avcodec_decode_audio4(st->codec, &picture, &got_picture, &pkt); + ret = avcodec_decode_audio4(st->codec, frame, &got_picture, &pkt); break; default: break; @@ -2141,6 +2147,9 @@ static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **option ret = got_picture; } } + +fail: + avcodec_free_frame(&frame); return ret; } |