[FFmpeg-cvslog] Merge commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245'
Michael Niedermayer
git at videolan.org
Sat Nov 2 09:55:55 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 2 09:48:34 2013 +0100| [02223f4dc4da797030d932ef5d186be9c9aff9ae] | committer: Michael Niedermayer
Merge commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245'
* commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245':
lavf: do not use int to store an int64
Conflicts:
libavformat/utils.c
See: ad56535dd1d7204ea0958decac15e8dfc86162ea
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=02223f4dc4da797030d932ef5d186be9c9aff9ae
---
More information about the ffmpeg-cvslog
mailing list