diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:10:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:11:33 +0200 |
| commit | 69ea65b46f1a101f9a4f2c914c75b752122e7cbe (patch) | |
| tree | 19e9bfa95c01a5739802ddd1704e1486a6cbd4ad /libavcodec/allcodecs.c | |
| parent | a0fb6083967afcd7f2c43ab3ff1e510912644daa (diff) | |
| parent | 3e5898782dce60334ab294821ca00b19c648cf66 (diff) | |
| download | ffmpeg-69ea65b46f1a101f9a4f2c914c75b752122e7cbe.tar.gz | |
Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'
* commit '3e5898782dce60334ab294821ca00b19c648cf66':
Voxware MetaSound decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index e3dd67a355..57329b5fe8 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -332,6 +332,7 @@ void avcodec_register_all(void) REGISTER_DECODER(IMC, imc); REGISTER_DECODER(MACE3, mace3); REGISTER_DECODER(MACE6, mace6); + REGISTER_DECODER(METASOUND, metasound); REGISTER_DECODER(MLP, mlp); REGISTER_DECODER(MP1, mp1); REGISTER_DECODER(MP1FLOAT, mp1float); |