summaryrefslogtreecommitdiff
path: root/libavcodec/metasound_data.c
Commit message (Collapse)AuthorAge
* Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'Michael Niedermayer2013-08-08
| | | | | | | | | | | | * commit '3e5898782dce60334ab294821ca00b19c648cf66': Voxware MetaSound decoder Conflicts: Changelog libavcodec/Makefile libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Voxware MetaSound decoderKostya Shishkov2013-08-08