Revision c53d2d90 libavcodec/cavs.c

View differences:

libavcodec/cavs.c
1506 1506

  
1507 1507
static int cavsvideo_parse(AVCodecParserContext *s,
1508 1508
                           AVCodecContext *avctx,
1509
                           uint8_t **poutbuf, int *poutbuf_size,
1509
                           const uint8_t **poutbuf, int *poutbuf_size,
1510 1510
                           const uint8_t *buf, int buf_size)
1511 1511
{
1512 1512
    ParseContext *pc = s->priv_data;
......
1517 1517
    }else{
1518 1518
        next= cavs_find_frame_end(pc, buf, buf_size);
1519 1519

  
1520
        if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) {
1520
        if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
1521 1521
            *poutbuf = NULL;
1522 1522
            *poutbuf_size = 0;
1523 1523
            return buf_size;
1524 1524
        }
1525 1525
    }
1526
    *poutbuf = (uint8_t *)buf;
1526
    *poutbuf = buf;
1527 1527
    *poutbuf_size = buf_size;
1528 1528
    return next;
1529 1529
}

Also available in: Unified diff