highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
dcda5ef1eab52a2392fd8f9ebf51a03052ddfce2
ffmpeg/libavcodec/gsm_parser.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

2.6 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink