Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Aug 2013 10:14:39 +0000 (12:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Aug 2013 10:14:39 +0000 (12:14 +0200)
commite4eab2d9bde330b9893a3291cb0d00c626a9ee8c
treedb03f89ac9f81ca2bcc685adf86e336cfacfde9e
parent6bf6d6ad498d760bb60b6973789ebbf9758c999e
parentf544c586364e157e52ecc8697bee77d342150999
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>
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavformat/riff.c