Merge commit 'c265b8bb7638546919465e3585441b1d40c4b13d'

* commit 'c265b8bb7638546919465e3585441b1d40c4b13d':
  tiff: stop using deprecated avcodec_set_dimensions
  targa: stop using deprecated avcodec_set_dimensions
  svq1dec: stop using deprecated avcodec_set_dimensions
  sunrast: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/sunrast.c
	libavcodec/targa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/sunrast.c
index a373df7,ffa685c..d9918f4
--- 1/libavcodec/sunrast.c
--- 2/libavcodec/sunrast.c
+++ b/libavcodec/sunrast.c
@@@ -100,10 -86,14 +96,12 @@@ static int sunrast_decode_frame(AVCodec
              return AVERROR_INVALIDDATA;
      }
  
-     if (w != avctx->width || h != avctx->height)
-         avcodec_set_dimensions(avctx, w, h);
+     ret = ff_set_dimensions(avctx, w, h);
+     if (ret < 0)
+         return ret;
+ 
 -    if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
 -        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 +    if ((ret = ff_get_buffer(avctx, p, 0)) < 0)
          return ret;
 -    }
  
      p->pict_type = AV_PICTURE_TYPE_I;
  

diff --cc libavcodec/svq1dec.c
Simple merge

diff --cc libavcodec/targa.c
index b3616c2,f077c03..b0c9b55
--- 1/libavcodec/targa.c
--- 2/libavcodec/targa.c
+++ b/libavcodec/targa.c
@@@ -168,23 -142,17 +168,22 @@@ static int decode_frame(AVCodecContext 
          return AVERROR_INVALIDDATA;
      }
  
-     if ((ret = av_image_check_size(w, h, 0, avctx)) < 0)
 +    if (colors && (colors + first_clr) > 256) {
 +        av_log(avctx, AV_LOG_ERROR, "Incorrect palette: %i colors with offset %i\n", colors, first_clr);
 +        return AVERROR_INVALIDDATA;
 +    }
 +
+     if ((ret = ff_set_dimensions(avctx, w, h)) < 0)
          return ret;
-     if (w != avctx->width || h != avctx->height)
-         avcodec_set_dimensions(avctx, w, h);
+ 
 -    if ((ret = ff_get_buffer(avctx, p, 0)) < 0){
 -        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 +    if ((ret = ff_get_buffer(avctx, p, 0)) < 0)
          return ret;
 -    }
 -    if(flags & 0x20){
 +    p->pict_type = AV_PICTURE_TYPE_I;
 +
 +    if (flags & TGA_TOPTOBOTTOM) {
          dst = p->data[0];
          stride = p->linesize[0];
 -    }else{ //image is upside-down
 +    } else { //image is upside-down
          dst = p->data[0] + p->linesize[0] * (h - 1);
          stride = -p->linesize[0];
      }

diff --cc libavcodec/tiff.c
index 2b100ed,7fb0e7a..cd20967
--- 1/libavcodec/tiff.c
--- 2/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@@ -546,20 -296,22 +546,20 @@@ static int init_image(TiffContext *s, T
          return AVERROR_INVALIDDATA;
      }
      if (s->width != s->avctx->width || s->height != s->avctx->height) {
-         if ((ret = av_image_check_size(s->width, s->height, 0, s->avctx)) < 0)
+         ret = ff_set_dimensions(s->avctx, s->width, s->height);
+         if (ret < 0)
              return ret;
-         avcodec_set_dimensions(s->avctx, s->width, s->height);
      }
 -    if ((ret = ff_get_buffer(s->avctx, frame, 0)) < 0) {
 -        av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 +    if ((ret = ff_thread_get_buffer(s->avctx, frame, 0)) < 0)
          return ret;
 -    }
      if (s->avctx->pix_fmt == AV_PIX_FMT_PAL8) {
          if (s->palette_is_set) {
 -            memcpy(frame->data[1], s->palette, sizeof(s->palette));
 +            memcpy(frame->f->data[1], s->palette, sizeof(s->palette));
          } else {
              /* make default grayscale pal */
 -            pal = (uint32_t *) frame->data[1];
 -            for (i = 0; i < 256; i++)
 -                pal[i] = i * 0x010101;
 +            pal = (uint32_t *) frame->f->data[1];
 +            for (i = 0; i < 1<<s->bpp; i++)
 +                pal[i] = 0xFFU << 24 | i * 255 / ((1<<s->bpp) - 1) * 0x010101;
          }
      }
      return 0;