[FFmpeg-cvslog] Merge commit 'e544782623caf1eb4b2429e9c4f35d6b627accba'
Michael Niedermayer
git at videolan.org
Mon Apr 22 12:33:07 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 22 12:04:10 2013 +0200| [52e40155a8e1f41b2d97e5832022263b77752f32] | committer: Michael Niedermayer
Merge commit 'e544782623caf1eb4b2429e9c4f35d6b627accba'
* commit 'e544782623caf1eb4b2429e9c4f35d6b627accba':
riff: Move guid structs and helper functions into riff
Conflicts:
libavformat/asf.h
libavformat/riff.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52e40155a8e1f41b2d97e5832022263b77752f32
---
More information about the ffmpeg-cvslog
mailing list