Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ATRAC3+ decoder

Conflicts:
	Changelog
	configure
	libavcodec/atrac3plus.c
	libavcodec/atrac3plus.h
	libavcodec/atrac3plus_data.h
	libavcodec/atrac3plusdec.c
	libavcodec/atrac3plusdsp.c
	libavcodec/version.h

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

diff --cc libavcodec/atrac3plus.c
Simple merge

diff --cc libavcodec/atrac3plus.h
Simple merge

diff --cc libavcodec/atrac3plusdec.c
index 51d7072,dbdb3b3..545dbec
--- 1/libavcodec/atrac3plusdec.c
--- 2/libavcodec/atrac3plusdec.c
+++ b/libavcodec/atrac3plusdec.c
@@@ -135,8 -135,11 +135,13 @@@ static av_cold int atrac3p_decode_init(
      ATRAC3PContext *ctx = avctx->priv_data;
      int i, ch, ret;
  
+     if (!avctx->block_align) {
+         av_log(avctx, AV_LOG_ERROR, "block_align is not set\n");
+         return AVERROR(EINVAL);
+     }
+ 
 +    ff_atrac3p_init_vlcs();
 +
      avpriv_float_dsp_init(&ctx->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
  
      /* initialize IPQF */

diff --cc libavcodec/atrac3plusdsp.c
Simple merge

diff --cc libavcodec/version.h
index 6436947,2aee76e..b27a8a6
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -29,8 -29,8 +29,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVCODEC_VERSION_MAJOR 55
 -#define LIBAVCODEC_VERSION_MINOR 32
 -#define LIBAVCODEC_VERSION_MICRO  0
 +#define LIBAVCODEC_VERSION_MINOR  47
- #define LIBAVCODEC_VERSION_MICRO 100
++#define LIBAVCODEC_VERSION_MICRO 101
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \