[FFmpeg-cvslog] Merge commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0'
Michael Niedermayer
git at videolan.org
Tue Nov 26 12:57:28 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 26 12:37:20 2013 +0100| [8c87658fdc657fa0c19c9b507645b03d5295eb49] | committer: Michael Niedermayer
Merge commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0'
* commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0':
MSN Audio support
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8c87658fdc657fa0c19c9b507645b03d5295eb49
---
More information about the ffmpeg-cvslog
mailing list