Revision c53d2d90 libavcodec/h263dec.c

View differences:

libavcodec/h263dec.c
396 396
#ifdef CONFIG_H263_PARSER
397 397
static int h263_parse(AVCodecParserContext *s,
398 398
                           AVCodecContext *avctx,
399
                           uint8_t **poutbuf, int *poutbuf_size,
399
                           const uint8_t **poutbuf, int *poutbuf_size,
400 400
                           const uint8_t *buf, int buf_size)
401 401
{
402 402
    ParseContext *pc = s->priv_data;
......
404 404

  
405 405
    next= h263_find_frame_end(pc, buf, buf_size);
406 406

  
407
    if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) {
407
    if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
408 408
        *poutbuf = NULL;
409 409
        *poutbuf_size = 0;
410 410
        return buf_size;
411 411
    }
412 412

  
413
    *poutbuf = (uint8_t *)buf;
413
    *poutbuf = buf;
414 414
    *poutbuf_size = buf_size;
415 415
    return next;
416 416
}
......
460 460
            return -1;
461 461
        }
462 462

  
463
        if( ff_combine_frame(&s->parse_context, next, &buf, &buf_size) < 0 )
463
        if( ff_combine_frame(&s->parse_context, next, (const uint8_t **)&buf, &buf_size) < 0 )
464 464
            return buf_size;
465 465
    }
466 466

  

Also available in: Unified diff