Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: update reference for seek-alac_mp4
  sunrast: Return AVERROR values instead of -1.
  sunrast: Add support for gray8 decoding.
  swscale: enforce a minimum filtersize.
  alacenc: use AVCodec.encode2()
  alacenc: cosmetics: indentation
  alacenc: consolidate bitstream writing into a single function.
  alacenc: only encode frame size in header for a final smaller frame
  alacenc: store current frame size in AlacEncodeContext.
  alacenc: return AVERROR codes in alac_encode_frame()
  alacenc: calculate a new max frame size for the final small frame
  alacenc: pretty-printing and other cosmetics
  alacenc: fix error handling and potential memleaks in alac_encode_init()
  alacenc: do not set coded_frame->key_frame
  alacenc: do not set bits_per_coded_sample
  alacenc: remove unneeded frame_size check in alac_encode_frame()
  tta: error out if samplerate is zero.
  ttadec: fix invalid free when an error occurs while decoding 24-bit tta
  wavpack: add needed braces for 2 statements inside an if block

Conflicts:
	tests/ref/acodec/alac

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

diff --cc libavcodec/alacenc.c
Simple merge

diff --cc libavcodec/sunrast.c
index 8562e11,d01a1ef..aab6435
--- 1/libavcodec/sunrast.c
--- 2/libavcodec/sunrast.c
+++ b/libavcodec/sunrast.c
@@@ -70,8 -70,9 +70,9 @@@ static int sunrast_decode_frame(AVCodec
      AVFrame *picture         = data;
      AVFrame * const p        = &s->picture;
      unsigned int w, h, depth, type, maptype, maplength, stride, x, y, len, alen;
 -    uint8_t *ptr;
 +    uint8_t *ptr, *ptr2 = NULL;
      const uint8_t *bufstart = buf;
+     int ret;
  
      if (avpkt->size < 32)
          return AVERROR_INVALIDDATA;
@@@ -103,13 -104,9 +104,13 @@@
      }
      if (maptype & ~1) {
          av_log(avctx, AV_LOG_ERROR, "invalid colormap type\n");
-         return -1;
+         return AVERROR_INVALIDDATA;
      }
  
 +    if (type == RT_FORMAT_TIFF || type == RT_FORMAT_IFF) {
 +        av_log(avctx, AV_LOG_ERROR, "unsupported (compression) type\n");
 +        return -1;
 +    }
  
      switch (depth) {
          case 1:
@@@ -124,12 -118,9 +125,12 @@@
          case 24:
              avctx->pix_fmt = (type == RT_FORMAT_RGB) ? PIX_FMT_RGB24 : PIX_FMT_BGR24;
              break;
 +        case 32:
 +            avctx->pix_fmt = (type == RT_FORMAT_RGB) ? PIX_FMT_RGB0 : PIX_FMT_BGR0;
 +            break;
          default:
              av_log(avctx, AV_LOG_ERROR, "invalid depth\n");
-             return -1;
+             return AVERROR_INVALIDDATA;
      }
  
      if (p->data[0])

diff --cc libavcodec/tta.c
Simple merge

diff --cc libavcodec/wavpack.c
Simple merge

diff --cc libswscale/utils.c
Simple merge

diff --cc tests/ref/acodec/alac
index 6d0f386,02752cf..3d98f27
--- 1/tests/ref/acodec/alac
--- 2/tests/ref/acodec/alac
+++ b/tests/ref/acodec/alac
@@@ -1,4 -1,4 +1,4 @@@
- cf9a4b40ab945367cbb0e6cbb4cf37a1 *./tests/data/acodec/alac.m4a
- 389166 ./tests/data/acodec/alac.m4a
 -b9e78aa8b8774a63d187380a47201a37 *./tests/data/acodec/alac.m4a
 -389154 ./tests/data/acodec/alac.m4a
++acaed80b0b5bbec7ee9dc0899166a6e2 *./tests/data/acodec/alac.m4a
++388910 ./tests/data/acodec/alac.m4a
  64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/alac.acodec.out.wav
  stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400