dilim/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-07-05 06:08:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
9ae73d0644cde27d3d93d41a5d8bc94de853ea91
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