virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

ljpegenc: allocate needed scratch-buffer

Browse Source 
Fixes null pointer dereference
Fixes Ticket2207

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-05 18:52:07 +01:00
parent a8343bfb6a
commit c2dd5a18b2
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/ljpegenc.c
View File

@ -57,6 +57,13 @@ static int encode_picture_lossless(AVCodecContext *avctx, AVPacket *pkt,
max_pkt_size += mb_width * mb_height * 3 * 4
* s->mjpeg_hsample[0] * s->mjpeg_vsample[0];
}
if (!s->edge_emu_buffer &&
(ret = ff_mpv_frame_size_alloc(s, pict->linesize[0])) < 0) {
av_log(avctx, AV_LOG_ERROR, "failed to allocate context scratch buffers.\n");
return ret;
}
if ((ret = ff_alloc_packet2(avctx, pkt, max_pkt_size)) < 0)
return ret;