virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/roqvideoenc: 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:05:56 +01:00
parent 6c9537b807
commit 96e7c9cbfc
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/roqvideoenc.c
View File

@@ -960,7 +960,8 @@ static int roq_encode_video(RoqContext *enc)
reconstruct_and_encode_image(enc, tempData, enc->width, enc->height, reconstruct_and_encode_image(enc, tempData, enc->width, enc->height,
enc->width*enc->height/64); enc->width*enc->height/64);
enc->avctx->coded_frame = enc->current_frame; av_frame_unref(enc->avctx->coded_frame);
av_frame_ref(enc->avctx->coded_frame, enc->current_frame);
/* Rotate frame history */ /* Rotate frame history */
FFSWAP(AVFrame *, enc->current_frame, enc->last_frame); FFSWAP(AVFrame *, enc->current_frame, enc->last_frame);
@@ -981,6 +982,7 @@ static av_cold int roq_encode_end(AVCodecContext *avctx)
av_frame_free(&enc->current_frame); av_frame_free(&enc->current_frame);
av_frame_free(&enc->last_frame); av_frame_free(&enc->last_frame);
av_frame_free(&enc->avctx->coded_frame);
av_freep(&enc->tmpData); av_freep(&enc->tmpData);
av_freep(&enc->this_motion4); av_freep(&enc->this_motion4);
@@ -1019,7 +1021,8 @@ static av_cold int roq_encode_init(AVCodecContext *avctx)
enc->last_frame = av_frame_alloc(); enc->last_frame = av_frame_alloc();
enc->current_frame = av_frame_alloc(); enc->current_frame = av_frame_alloc();
if (!enc->last_frame || !enc->current_frame) { avctx->coded_frame = av_frame_alloc();
if (!enc->last_frame || !enc->current_frame || !avctx->coded_frame) {
roq_encode_end(avctx); roq_encode_end(avctx);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }