Revision c53d2d90 libavcodec/pnm.c

View differences:

libavcodec/pnm.c
489 489
#ifdef CONFIG_PNM_PARSER
490 490
static int pnm_parse(AVCodecParserContext *s,
491 491
                           AVCodecContext *avctx,
492
                           uint8_t **poutbuf, int *poutbuf_size,
492
                           const uint8_t **poutbuf, int *poutbuf_size,
493 493
                           const uint8_t *buf, int buf_size)
494 494
{
495 495
    ParseContext *pc = s->priv_data;
......
538 538
            next= END_NOT_FOUND;
539 539
    }
540 540

  
541
    if(ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size)<0){
541
    if(ff_combine_frame(pc, next, &buf, &buf_size)<0){
542 542
        *poutbuf = NULL;
543 543
        *poutbuf_size = 0;
544 544
        return buf_size;
545 545
    }
546
    *poutbuf = (uint8_t *)buf;
546
    *poutbuf = buf;
547 547
    *poutbuf_size = buf_size;
548 548
    return next;
549 549
}

Also available in: Unified diff