diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-07 12:14:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-07 12:14:39 +0200 |
| commit | e4eab2d9bde330b9893a3291cb0d00c626a9ee8c (patch) | |
| tree | db03f89ac9f81ca2bcc685adf86e336cfacfde9e /libavformat | |
| parent | 6bf6d6ad498d760bb60b6973789ebbf9758c999e (diff) | |
| parent | f544c586364e157e52ecc8697bee77d342150999 (diff) | |
| download | ffmpeg-e4eab2d9bde330b9893a3291cb0d00c626a9ee8c.tar.gz | |
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>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/riff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 84d97ed5c2..8bcf929365 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -384,7 +384,7 @@ const AVCodecTag ff_codec_wav_tags[] = { /* rogue format number */ { AV_CODEC_ID_ADPCM_IMA_DK3, 0x0062 }, { AV_CODEC_ID_ADPCM_IMA_WAV, 0x0069 }, - { AV_CODEC_ID_VOXWARE, 0x0075 }, + { AV_CODEC_ID_METASOUND, 0x0075 }, { AV_CODEC_ID_AAC, 0x00ff }, { AV_CODEC_ID_SIPR, 0x0130 }, { AV_CODEC_ID_WMAV1, 0x0160 }, |