[FFmpeg-cvslog] Merge commit 'a3bf80a5aea577663354bd538e345b283bcb73de'
Michael Niedermayer
git at videolan.org
Mon Apr 22 12:41:54 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 22 12:36:29 2013 +0200| [05deb05fe9ce28cc7b9951446edfaabc364b0b88] | committer: Michael Niedermayer
Merge commit 'a3bf80a5aea577663354bd538e345b283bcb73de'
* commit 'a3bf80a5aea577663354bd538e345b283bcb73de':
riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=05deb05fe9ce28cc7b9951446edfaabc364b0b88
---
More information about the ffmpeg-cvslog
mailing list