Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: try to use mmap only if available
  configure: check for mprotect
  wmapro: use planar sample format
  wmalossless: output in planar sample format
  wmadec: use float planar sample format output
  shorten: use planar sample format
  lavc: update documentation for AVFrame.extended_data

Conflicts:
	libavcodec/shorten.c

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

diff --cc configure
index eead2d6,8652639..33dd3b3
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1344,14 -1198,11 +1344,15 @@@ HAVE_LIST=
      mkstemp
      mm_empty
      mmap
+     mprotect
      msvcrt
      nanosleep
 +    PeekNamedPipe
 +    perl
 +    pod2man
      poll_h
      posix_memalign
 +    pthread_cancel
      rdtsc
      rint
      round

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/shorten.c
index d04011e,1664a90..c36bb9e
--- 1/libavcodec/shorten.c
--- 2/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@@ -189,16 -186,12 +189,16 @@@ static int init_offset(ShortenContext *
      /* initialise offset */
      switch (s->internal_ftype)
      {
 +        case TYPE_U8:
 +            s->avctx->sample_fmt = AV_SAMPLE_FMT_U8;
 +            mean = 0x80;
 +            break;
          case TYPE_S16HL:
          case TYPE_S16LH:
-             s->avctx->sample_fmt = AV_SAMPLE_FMT_S16;
 -            mean = 0;
++            s->avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
              break;
          default:
 -            av_log(s->avctx, AV_LOG_ERROR, "unknown audio type");
 +            av_log(s->avctx, AV_LOG_ERROR, "unknown audio type\n");
              return AVERROR_INVALIDDATA;
      }
  
@@@ -587,23 -585,10 +587,24 @@@ static int shorten_decode_frame(AVCodec
                      av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
                      return ret;
                  }
-                 samples_u8  = (uint8_t *)s->frame.data[0];
-                 samples_s16 = (int16_t *)s->frame.data[0];
--                /* interleave output */
-                 for (i = 0; i < s->blocksize; i++) {
-                     for (chan = 0; chan < s->channels; chan++) {
 -                output_buffer((int16_t **)s->frame.extended_data, s->channels,
 -                              s->blocksize, s->decoded);
++
++                for (chan = 0; chan < s->channels; chan++) {
++                    samples_u8  = ((uint8_t **)s->frame.extended_data)[chan];
++                    samples_s16 = ((int16_t **)s->frame.extended_data)[chan];
++                    for (i = 0; i < s->blocksize; i++) {
 +                        switch (s->internal_ftype) {
 +                        case TYPE_U8:
 +                            *samples_u8++ = av_clip_uint8(s->decoded[chan][i]);
 +                            break;
 +                        case TYPE_S16HL:
 +                        case TYPE_S16LH:
 +                            *samples_s16++ = av_clip_int16(s->decoded[chan][i]);
 +                            break;
 +                        }
 +                    }
 +                }
 +
+ 
                  *got_frame_ptr   = 1;
                  *(AVFrame *)data = s->frame;
              }

diff --cc libavcodec/wmadec.c
index 1bcf0da,bbb8402..ca12d24
--- 1/libavcodec/wmadec.c
--- 2/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@@ -960,9 -933,10 +947,11 @@@ AVCodec ff_wmav1_decoder = 
      .flush          = flush,
      .capabilities   = CODEC_CAP_DR1,
      .long_name      = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"),
+     .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
+                                                       AV_SAMPLE_FMT_NONE },
  };
 -
 +#endif
 +#if CONFIG_WMAV2_DECODER
  AVCodec ff_wmav2_decoder = {
      .name           = "wmav2",
      .type           = AVMEDIA_TYPE_AUDIO,
@@@ -974,5 -948,6 +963,7 @@@
      .flush          = flush,
      .capabilities   = CODEC_CAP_DR1,
      .long_name      = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"),
+     .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
+                                                       AV_SAMPLE_FMT_NONE },
  };
 +#endif

diff --cc libavcodec/wmalosslessdec.c
Simple merge

diff --cc libavcodec/wmaprodec.c
Simple merge

diff --cc libswscale/utils.c
index 3310d78,a40dfe7..24058c3
--- 1/libswscale/utils.c
--- 2/libswscale/utils.c
+++ b/libswscale/utils.c
@@@ -1106,12 -1048,12 +1108,12 @@@ av_cold int sws_init_context(SwsContex
              FF_ALLOCZ_OR_GOTO(c, c->hLumFilterPos, (dstW       / 2 / 8 + 8) * sizeof(int32_t), fail);
              FF_ALLOCZ_OR_GOTO(c, c->hChrFilterPos, (c->chrDstW / 2 / 4 + 8) * sizeof(int32_t), fail);
  
 -            initMMX2HScaler(dstW, c->lumXInc, c->lumMmx2FilterCode,
 -                            c->hLumFilter, c->hLumFilterPos, 8);
 +            initMMX2HScaler(      dstW, c->lumXInc, c->lumMmx2FilterCode,
 +                            c->hLumFilter, (uint32_t*)c->hLumFilterPos, 8);
              initMMX2HScaler(c->chrDstW, c->chrXInc, c->chrMmx2FilterCode,
 -                            c->hChrFilter, c->hChrFilterPos, 4);
 +                            c->hChrFilter, (uint32_t*)c->hChrFilterPos, 4);
  
- #ifdef MAP_ANONYMOUS
+ #if USE_MMAP
              mprotect(c->lumMmx2FilterCode, c->lumMmx2FilterCodeSize, PROT_EXEC | PROT_READ);
              mprotect(c->chrMmx2FilterCode, c->chrMmx2FilterCodeSize, PROT_EXEC | PROT_READ);
  #endif