har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/snowenc: Allocate and reference coded_frame correctly

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-23 19:09:44 +01:00
parent 96e7c9cbfc
commit 34a8de866f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/snowenc.c
View File

@ -124,7 +124,8 @@ static av_cold int encode_init(AVCodecContext *avctx)
ff_set_cmp(&s->mecc, s->mecc.me_sub_cmp, s->avctx->me_sub_cmp); ff_set_cmp(&s->mecc, s->mecc.me_sub_cmp, s->avctx->me_sub_cmp);
s->input_picture = av_frame_alloc(); s->input_picture = av_frame_alloc();
if (!s->input_picture) avctx->coded_frame = av_frame_alloc();
if (!s->input_picture || !avctx->coded_frame)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if ((ret = ff_snow_get_buffer(s, s->input_picture)) < 0) if ((ret = ff_snow_get_buffer(s, s->input_picture)) < 0)
@ -1620,7 +1621,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
} }
ff_snow_frame_start(s); ff_snow_frame_start(s);
avctx->coded_frame= s->current_picture; av_frame_unref(avctx->coded_frame);
av_frame_ref(avctx->coded_frame, s->current_picture);
s->m.current_picture_ptr= &s->m.current_picture; s->m.current_picture_ptr= &s->m.current_picture;
s->m.current_picture.f = s->current_picture; s->m.current_picture.f = s->current_picture;
@ -1862,6 +1864,7 @@ static av_cold int encode_end(AVCodecContext *avctx)
ff_snow_common_end(s); ff_snow_common_end(s);
ff_rate_control_uninit(&s->m); ff_rate_control_uninit(&s->m);
av_frame_free(&s->input_picture); av_frame_free(&s->input_picture);
av_frame_free(&avctx->coded_frame);
av_freep(&avctx->stats_out); av_freep(&avctx->stats_out);
return 0; return 0;