[FFmpeg-cvslog] Merge commit '60198742ff851f11a3757c713fc75a9c19b88566'
Michael Niedermayer
git at videolan.org
Thu Aug 22 14:21:14 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 22 14:16:52 2013 +0200| [25e4ec6aa14d5e9f2aebc87e1f076c4669f2e1f7] | committer: Michael Niedermayer
Merge commit '60198742ff851f11a3757c713fc75a9c19b88566'
* commit '60198742ff851f11a3757c713fc75a9c19b88566':
movenc: fix detection of 64bit offset requirement
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25e4ec6aa14d5e9f2aebc87e1f076c4669f2e1f7
---
More information about the ffmpeg-cvslog
mailing list