Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit '3e5898782dce60334ab294821ca00b19c648cf66' | Michael Niedermayer | 2013-08-08 | 1 | -4/+4 |
| | | | | | | | | | | | | * commit '3e5898782dce60334ab294821ca00b19c648cf66': Voxware MetaSound decoder Conflicts: Changelog libavcodec/Makefile libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||||
* | Voxware MetaSound decoder | Kostya Shishkov | 2013-08-08 | 1 | -0/+49 |