comparison msvideo1.c @ 1598:932d306bf1dc libavcodec

av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)

1597:4c9165372ab3

#define PALETTE_COUNT 256
#define LE_16(x)  ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
#define CHECK_STREAM_PTR(n) \
  if ((stream_ptr + n) > s->size ) { \
    printf (" MS Video-1 warning: stream_ptr out of bounds (%d >= %d)\n", \
      stream_ptr + n, s->size); \
    return; \
  }

#define COPY_PREV_BLOCK() \

    s->buf = buf;
    s->size = buf_size;

    if (avctx->get_buffer(avctx, &s->frame)) {
        printf ("  MS Video-1 Video: get_buffer() failed\n");
        return -1;
    }

    if (s->prev_frame.data[0] &&(s->frame.linesize[0] != s->prev_frame.linesize[0]))
        printf ("  MS Video-1: Buffer linesize changed: current %u, previous %u.\n"
                "              Expect wrong image and/or crash!\n",
                s->frame.linesize[0], s->prev_frame.linesize[0]);

    if (s->mode_8bit)
        msvideo1_decode_8bit(s);

1598:932d306bf1dc

#define PALETTE_COUNT 256
#define LE_16(x)  ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
#define CHECK_STREAM_PTR(n) \
  if ((stream_ptr + n) > s->size ) { \
    av_log(s->avctx, AV_LOG_ERROR, " MS Video-1 warning: stream_ptr out of bounds (%d >= %d)\n", \
      stream_ptr + n, s->size); \
    return; \
  }

#define COPY_PREV_BLOCK() \

    s->buf = buf;
    s->size = buf_size;

    if (avctx->get_buffer(avctx, &s->frame)) {
        av_log(s->avctx, AV_LOG_ERROR, "  MS Video-1 Video: get_buffer() failed\n");
        return -1;
    }

    if (s->prev_frame.data[0] &&(s->frame.linesize[0] != s->prev_frame.linesize[0]))
        av_log(avctx, AV_LOG_ERROR, "  MS Video-1: Buffer linesize changed: current %u, previous %u.\n"
                "              Expect wrong image and/or crash!\n",
                s->frame.linesize[0], s->prev_frame.linesize[0]);

    if (s->mode_8bit)
        msvideo1_decode_8bit(s);