generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'

Browse Source 
* commit '3e5898782dce60334ab294821ca00b19c648cf66':
  Voxware MetaSound decoder

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-08-08 12:10:39 +02:00
parent a0fb608396 3e5898782d
commit 69ea65b46f
10 changed files with 5489 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/allcodecs.c
View File

@@ -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);