comparison tiff.c @ 12462:ffb3668ff7af libavcodec

Use new imgutils.h API names, fix deprecation warnings.

12461:25174028da0a

        default:
            av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%d, %d components)\n", s->bpp, count);
            return -1;
        }
        if(s->width != s->avctx->width || s->height != s->avctx->height){
            if(av_check_image_size(s->width, s->height, 0, s->avctx))
                return -1;
            avcodec_set_dimensions(s->avctx, s->width, s->height);
        }
        if(s->picture.data[0])
            s->avctx->release_buffer(s->avctx, &s->picture);

    /* now we have the data and may start decoding */
    if(!p->data[0]){
        s->bpp = 1;
        avctx->pix_fmt = PIX_FMT_MONOBLACK;
        if(s->width != s->avctx->width || s->height != s->avctx->height){
            if(av_check_image_size(s->width, s->height, 0, s->avctx))
                return -1;
            avcodec_set_dimensions(s->avctx, s->width, s->height);
        }
        if(s->picture.data[0])
            s->avctx->release_buffer(s->avctx, &s->picture);

12462:ffb3668ff7af

        default:
            av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%d, %d components)\n", s->bpp, count);
            return -1;
        }
        if(s->width != s->avctx->width || s->height != s->avctx->height){
            if(av_image_check_size(s->width, s->height, 0, s->avctx))
                return -1;
            avcodec_set_dimensions(s->avctx, s->width, s->height);
        }
        if(s->picture.data[0])
            s->avctx->release_buffer(s->avctx, &s->picture);

    /* now we have the data and may start decoding */
    if(!p->data[0]){
        s->bpp = 1;
        avctx->pix_fmt = PIX_FMT_MONOBLACK;
        if(s->width != s->avctx->width || s->height != s->avctx->height){
            if(av_image_check_size(s->width, s->height, 0, s->avctx))
                return -1;
            avcodec_set_dimensions(s->avctx, s->width, s->height);
        }
        if(s->picture.data[0])
            s->avctx->release_buffer(s->avctx, &s->picture);