[FFmpeg-cvslog] Merge commit '5b4eb243bce10a3e8345401a353749e0414c54ca'
Michael Niedermayer
git at videolan.org
Tue Jul 16 00:08:27 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 15 23:58:38 2013 +0200| [38b701a3492446d7601336c4938fed2b822aa163] | committer: Michael Niedermayer
Merge commit '5b4eb243bce10a3e8345401a353749e0414c54ca'
* commit '5b4eb243bce10a3e8345401a353749e0414c54ca':
mov: Seek back if overreading an individual atom
Conflicts:
libavformat/mov.c
See: 6093960ae35c8d69c559b5604f683c2ea3f279ca
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38b701a3492446d7601336c4938fed2b822aa163
---
More information about the ffmpeg-cvslog
mailing list