diff options
| author | Michael Niedermayer | 2014-03-09 22:25:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer | 2014-03-09 22:25:41 +0100 |
| commit | 858d9947e4fe1b89d3f75a2a7d9fca7e5a496062 (patch) | |
| tree | 74b916f5c88c76db861a631c58bf43daac07aac7 /libavformat/isom.c | |
| parent | 9f71e5d39e0e698af05a2e6815ffff99bb493286 (diff) | |
| parent | 8a0bc40545a216a49f43db5d9a42a63961333354 (diff) | |
Merge commit '8a0bc40545a216a49f43db5d9a42a63961333354'
* commit '8a0bc40545a216a49f43db5d9a42a63961333354':
libspeex: support ZygoAudio (quality 10 mode)
Conflicts:
libavformat/isom.c
See: e26b066cd8db361feba90e943c6cfdf062c52272
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index ba952b826e..f7540ebb55 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -300,7 +300,7 @@ const AVCodecTag ff_codec_movaudio_tags[] = { { AV_CODEC_ID_QDM2, MKTAG('Q', 'D', 'M', '2') }, { AV_CODEC_ID_QDMC, MKTAG('Q', 'D', 'M', 'C') }, { AV_CODEC_ID_SPEEX, MKTAG('s', 'p', 'e', 'x') }, /* Flash Media Server */ - { AV_CODEC_ID_SPEEX, MKTAG('S', 'P', 'X', 'N') }, + { AV_CODEC_ID_SPEEX, MKTAG('S', 'P', 'X', 'N') }, /* ZygoAudio (quality 10 mode) */ { AV_CODEC_ID_WMAV2, MKTAG('W', 'M', 'A', '2') }, { AV_CODEC_ID_EVRC, MKTAG('s', 'e', 'v', 'c') }, /* 3GPP2 */ { AV_CODEC_ID_SMV, MKTAG('s', 's', 'm', 'v') }, /* 3GPP2 */ |