Revision c53d2d90 libavcodec/mjpeg.c

View differences:

libavcodec/mjpeg.c
1005 1005

  
1006 1006
static int jpeg_parse(AVCodecParserContext *s,
1007 1007
                           AVCodecContext *avctx,
1008
                           uint8_t **poutbuf, int *poutbuf_size,
1008
                           const uint8_t **poutbuf, int *poutbuf_size,
1009 1009
                           const uint8_t *buf, int buf_size)
1010 1010
{
1011 1011
    ParseContext *pc = s->priv_data;
......
1013 1013

  
1014 1014
    next= find_frame_end(pc, buf, buf_size);
1015 1015

  
1016
    if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) {
1016
    if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
1017 1017
        *poutbuf = NULL;
1018 1018
        *poutbuf_size = 0;
1019 1019
        return buf_size;
1020 1020
    }
1021 1021

  
1022
    *poutbuf = (uint8_t *)buf;
1022
    *poutbuf = buf;
1023 1023
    *poutbuf_size = buf_size;
1024 1024
    return next;
1025 1025
}

Also available in: Unified diff