Merge remote-tracking branch 'qatar/master'

* qatar/master:
  deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead

Conflicts:
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h

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

diff --cc libavcodec/avcodec.h
index c7582e2,adfd25a..2b98083
--- 1/libavcodec/avcodec.h
--- 2/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@@ -448,17 -414,10 +450,18 @@@ enum AVCodecID 
      AV_CODEC_ID_RALF,
      AV_CODEC_ID_IAC,
      AV_CODEC_ID_ILBC,
 -    AV_CODEC_ID_OPUS,
 +    AV_CODEC_ID_OPUS_DEPRECATED,
      AV_CODEC_ID_COMFORT_NOISE,
 -    AV_CODEC_ID_TAK,
 +    AV_CODEC_ID_TAK_DEPRECATED,
+     AV_CODEC_ID_METASOUND,
 +    AV_CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
 +    AV_CODEC_ID_SONIC       = MKBETAG('S','O','N','C'),
 +    AV_CODEC_ID_SONIC_LS    = MKBETAG('S','O','N','L'),
 +    AV_CODEC_ID_PAF_AUDIO   = MKBETAG('P','A','F','A'),
 +    AV_CODEC_ID_OPUS        = MKBETAG('O','P','U','S'),
 +    AV_CODEC_ID_TAK         = MKBETAG('t','B','a','K'),
 +    AV_CODEC_ID_EVRC        = MKBETAG('s','e','v','c'),
 +    AV_CODEC_ID_SMV         = MKBETAG('s','s','m','v'),
  
      /* subtitle codecs */
      AV_CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.

diff --cc libavcodec/codec_desc.c
index adc4772,b91b468..ff468f6
--- 1/libavcodec/codec_desc.c
--- 2/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@@ -2389,19 -2150,12 +2391,26 @@@ static const AVCodecDescriptor codec_de
          .props     = AV_CODEC_PROP_LOSSLESS,
      },
      {
+         .id        = AV_CODEC_ID_METASOUND,
+         .type      = AVMEDIA_TYPE_AUDIO,
+         .name      = "metasound",
+         .long_name = NULL_IF_CONFIG_SMALL("Voxware MetaSound"),
+         .props     = AV_CODEC_PROP_LOSSY,
+     },
++    {
 +        .id        = AV_CODEC_ID_EVRC,
 +        .type      = AVMEDIA_TYPE_AUDIO,
 +        .name      = "evrc",
 +        .long_name = NULL_IF_CONFIG_SMALL("EVRC (Enhanced Variable Rate Codec)"),
 +        .props     = AV_CODEC_PROP_LOSSY,
 +    },
 +    {
 +        .id        = AV_CODEC_ID_SMV,
 +        .type      = AVMEDIA_TYPE_AUDIO,
 +        .name      = "smv",
 +        .long_name = NULL_IF_CONFIG_SMALL("SMV (Selectable Mode Vocoder)"),
 +        .props     = AV_CODEC_PROP_LOSSY,
 +    },
  
      /* subtitle codecs */
      {

diff --cc libavcodec/version.h
index 4b9a4b2,4637b3a..50eee90
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -26,11 -26,9 +26,11 @@@
   * Libavcodec version macros.
   */
  
 +#include "libavutil/avutil.h"
 +
  #define LIBAVCODEC_VERSION_MAJOR 55
- #define LIBAVCODEC_VERSION_MINOR  22
 -#define LIBAVCODEC_VERSION_MINOR 14
 -#define LIBAVCODEC_VERSION_MICRO  0
++#define LIBAVCODEC_VERSION_MINOR  23
 +#define LIBAVCODEC_VERSION_MICRO 100
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \

diff --cc libavformat/riff.c
Simple merge