virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-29 05:57:37 +02:00
Code Issues Releases Activity
Files
a46a23d30fea9c8a5570e07ec4d9c9b4eaa6eb4f
FFmpeg/libavcodec/msgsmdec.h
Michael Niedermayer 8c87658fdc Merge commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0' 
* commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0':
  MSN Audio support

Conflicts:
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-26 12:37:20 +01:00

1.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink