eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 05:35:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
50b77e364f0a8c94de523e1d5afcd2be0a9a0384
ffmpeg/libavcodec/gsmdec_data.c
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

6.7 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink