Merge commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a'

* commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a':
  alacenc: support 24-bit encoding
  pcmdec: use planar sample format for pcm_s16le_planar
  vorbisdec: use float planar sample format

Conflicts:
	libavcodec/pcm.c

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

diff --cc libavcodec/alacenc.c
index 79b6ba8,4d6bf7b..706810f
--- 1/libavcodec/alacenc.c
--- 2/libavcodec/alacenc.c
+++ b/libavcodec/alacenc.c
@@@ -546,13 -584,23 +584,21 @@@ static int alac_encode_frame(AVCodecCon
      else
          max_frame_size = s->max_coded_frame_size;
  
 -    if ((ret = ff_alloc_packet(avpkt, 2 * max_frame_size))) {
 -        av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n");
 +    if ((ret = ff_alloc_packet2(avctx, avpkt, 2 * max_frame_size)))
          return ret;
 -    }
  
      /* use verbatim mode for compression_level 0 */
-     s->verbatim = !s->compression_level;
+     if (s->compression_level) {
+         s->verbatim   = 0;
+         s->extra_bits = avctx->bits_per_raw_sample - 16;
+     } else {
+         s->verbatim   = 1;
+         s->extra_bits = 0;
+     }
+     s->write_sample_size = avctx->bits_per_raw_sample - s->extra_bits +
+                            avctx->channels - 1;
  
-     out_bytes = write_frame(s, avpkt, samples);
+     out_bytes = write_frame(s, avpkt, frame->extended_data);
  
      if (out_bytes > max_frame_size) {
          /* frame too large. use verbatim mode */

diff --cc libavcodec/pcm.c
index 36385f7,906e8e8..b0daf21
--- 1/libavcodec/pcm.c
--- 2/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@@ -354,18 -336,20 +354,27 @@@ static int pcm_decode_frame(AVCodecCont
              samples += 2;
          }
          break;
 +    case AV_CODEC_ID_PCM_S16BE_PLANAR:
 +        DECODE_PLANAR(16, be16, src, samples, n, 0, 0);
 +        break;
      case AV_CODEC_ID_PCM_S16LE_PLANAR:
-         DECODE_PLANAR(16, le16, src, samples, n, 0, 0);
 -    {
+         n /= avctx->channels;
+         for (c = 0; c < avctx->channels; c++) {
+             samples = s->frame.extended_data[c];
+ #if HAVE_BIGENDIAN
+             DECODE(16, le16, src, samples, n, 0, 0)
+ #else
+             memcpy(samples, src, n * 2);
+ #endif
+             src += n * 2;
+         }
          break;
 -    }
 +    case AV_CODEC_ID_PCM_S24LE_PLANAR:
 +        DECODE_PLANAR(32, le24, src, samples, n, 8, 0);
 +        break;
 +    case AV_CODEC_ID_PCM_S32LE_PLANAR:
 +        DECODE_PLANAR(32, le32, src, samples, n, 0, 0);
 +        break;
      case AV_CODEC_ID_PCM_U16LE:
          DECODE(16, le16, src, samples, n, 0, 0x8000)
          break;

diff --cc libavcodec/vorbisdec.c
Simple merge