diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-23 20:47:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-23 20:47:13 +0200 |
| commit | 56efd98a6574641a32f08cd5123725cef28a309b (patch) | |
| tree | 27a85d0dc0eb40d0ad99e96bb7684514be3da44f /libavformat/riff.c | |
| parent | ecb815e5117f3353ed3e67bb737029773d170212 (diff) | |
| parent | e2834567d73bd1e46478ba67ac133cb8ef5f50fd (diff) | |
| download | ffmpeg-56efd98a6574641a32f08cd5123725cef28a309b.tar.gz | |
Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'
* commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd':
On2 AVC decoder
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 1f8f0fe928..735dea0eaf 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -410,6 +410,8 @@ const AVCodecTag ff_codec_wav_tags[] = { { AV_CODEC_ID_ADPCM_G722, 0x028F }, { AV_CODEC_ID_IMC, 0x0401 }, { AV_CODEC_ID_IAC, 0x0402 }, + { AV_CODEC_ID_ON2AVC, 0x0500 }, + { AV_CODEC_ID_ON2AVC, 0x0501 }, { AV_CODEC_ID_GSM_MS, 0x1500 }, { AV_CODEC_ID_TRUESPEECH, 0x1501 }, /* ADTS AAC */ |