eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-22 15:00:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
05cc8c8e4b7008ff3be8ec477c901b2ceca4b16b
ffmpeg/libavcodec/metasound_data.h
Michael Niedermayer 69ea65b46f Merge commit '3e5898782dce60334ab294821ca00b19c648cf66' 
* commit '3e5898782dce60334ab294821ca00b19c648cf66':
  Voxware MetaSound decoder

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-08 12:11:33 +02:00

1.9 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink