Merge commit '5a79bf0284a37855636390e620d189a964214c9e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jun 2015 18:32:12 +0000 (20:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jun 2015 18:36:26 +0000 (20:36 +0200)
* commit '5a79bf0284a37855636390e620d189a964214c9e':
  PCM signed 16-bit big-endian planar decoder

Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/pcm.c
libavcodec/version.h
libavformat/nut.c

See: 9ba41ae63e079198ef4a9e83b5fa147e20966bdb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/avcodec.h
libavcodec/version.h

@@@ -356,11 -329,9 +356,12 @@@ enum AVCodecID 
      AV_CODEC_ID_PCM_LXF,
      AV_CODEC_ID_S302M,
      AV_CODEC_ID_PCM_S8_PLANAR,
 -    AV_CODEC_ID_PCM_S24LE_PLANAR,
 -    AV_CODEC_ID_PCM_S32LE_PLANAR,
 -    AV_CODEC_ID_PCM_S16BE_PLANAR,
 +    AV_CODEC_ID_PCM_S24LE_PLANAR_DEPRECATED,
 +    AV_CODEC_ID_PCM_S32LE_PLANAR_DEPRECATED,
++    AV_CODEC_ID_PCM_S16BE_PLANAR_DEPRECATED,
 +    AV_CODEC_ID_PCM_S24LE_PLANAR = MKBETAG(24,'P','S','P'),
 +    AV_CODEC_ID_PCM_S32LE_PLANAR = MKBETAG(32,'P','S','P'),
 +    AV_CODEC_ID_PCM_S16BE_PLANAR = MKBETAG('P','S','P',16),
  
      /* various ADPCM codecs */
      AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
@@@ -29,8 -29,8 +29,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVCODEC_VERSION_MAJOR 56
- #define LIBAVCODEC_VERSION_MINOR  44
- #define LIBAVCODEC_VERSION_MICRO 101
 -#define LIBAVCODEC_VERSION_MINOR 29
 -#define LIBAVCODEC_VERSION_MICRO  0
++#define LIBAVCODEC_VERSION_MINOR  45
++#define LIBAVCODEC_VERSION_MICRO 100
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \