comparison cinepak.c @ 1572:860e44e2c20c libavcodec

support Cinepak files with funky (not divisible by 4) resolutions

1571:aa4dc16c0f18

    AVFrame frame;
    AVFrame prev_frame;

    unsigned char *data;
    int size;

    unsigned char palette[PALETTE_COUNT * 4];
    int palette_video;
    cvid_strip_t strips[MAX_STRIPS];

{
    uint8_t *eod = (data + size);
    int      chunk_id, chunk_size;

    /* coordinate sanity checks */
    if (strip->x1 >= s->avctx->width  || strip->x2 > s->avctx->width  ||
        strip->y1 >= s->avctx->height || strip->y2 > s->avctx->height ||
        strip->x1 >= strip->x2        || strip->y1 >= strip->y2)
        return -1;

    while ((data + 4) <= eod) {
        chunk_id   = BE_16 (&data[0]);
        chunk_size = BE_16 (&data[2]) - 4;

    unsigned char *raw_palette;
    unsigned int *palette32;
*/

    s->avctx = avctx;

// check for paletted data
s->palette_video = 0;

1572:860e44e2c20c

    AVFrame frame;
    AVFrame prev_frame;

    unsigned char *data;
    int size;

    int width, height;

    unsigned char palette[PALETTE_COUNT * 4];
    int palette_video;
    cvid_strip_t strips[MAX_STRIPS];

{
    uint8_t *eod = (data + size);
    int      chunk_id, chunk_size;

    /* coordinate sanity checks */
    if (strip->x1 >= s->width  || strip->x2 > s->width  ||
        strip->y1 >= s->height || strip->y2 > s->height ||
        strip->x1 >= strip->x2 || strip->y1 >= strip->y2)
        return -1;

    while ((data + 4) <= eod) {
        chunk_id   = BE_16 (&data[0]);
        chunk_size = BE_16 (&data[2]) - 4;

    unsigned char *raw_palette;
    unsigned int *palette32;
*/

    s->avctx = avctx;
    s->width = (avctx->width + 3) & ~3;
    s->height = (avctx->height + 3) & ~3;

// check for paletted data
s->palette_video = 0;