[FFmpeg-cvslog] Merge commit 'b845f5e97b655de0a191f736594777fec9754cf5'
Michael Niedermayer
git at videolan.org
Mon Apr 22 13:01:26 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 22 12:53:58 2013 +0200| [645d0384e85bb40b2307c559d0cfc914438e5bff] | committer: Michael Niedermayer
Merge commit 'b845f5e97b655de0a191f736594777fec9754cf5'
* commit 'b845f5e97b655de0a191f736594777fec9754cf5':
riff: Factor out WAVEFORMATEX parsing
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=645d0384e85bb40b2307c559d0cfc914438e5bff
---
More information about the ffmpeg-cvslog
mailing list