Browse Source

ljpegenc: allocate needed scratch-buffer

Fixes null pointer dereference
Fixes Ticket2207

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.2
Michael Niedermayer 12 years ago
parent
commit
c2dd5a18b2
1 changed files with 7 additions and 0 deletions
  1. +7
    -0
      libavcodec/ljpegenc.c

+ 7
- 0
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 max_pkt_size += mb_width * mb_height * 3 * 4
* s->mjpeg_hsample[0] * s->mjpeg_vsample[0]; * 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) if ((ret = ff_alloc_packet2(avctx, pkt, max_pkt_size)) < 0)
return ret; return ret;




Loading…
Cancel
Save