[FFmpeg-cvslog] Merge commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7'
Michael Niedermayer
git at videolan.org
Wed Oct 8 21:43:23 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 8 21:35:40 2014 +0200| [911ba8fb197dee6fb1dd4ac2d1fa2d8541ab6ab5] | committer: Michael Niedermayer
Merge commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7'
* commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7':
avformat: use const char* instead of uint8_t* for AVProbeData.mime_type
Conflicts:
libavformat/format.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=911ba8fb197dee6fb1dd4ac2d1fa2d8541ab6ab5
---
More information about the ffmpeg-cvslog
mailing list