[FFmpeg-cvslog] Merge commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e'
Michael Niedermayer
git at videolan.org
Fri Mar 6 21:07:36 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 6 20:54:41 2015 +0100| [1468ff49dfdeaf8e69cb640a326c95ba049c9c98] | committer: Michael Niedermayer
Merge commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e'
* commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e':
movenc: Keep writing zero-entry stts atoms as intended
Conflicts:
libavformat/movenc.c
See: 95165f7c1b533c121b890fa1e82e8ed596cfc108
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1468ff49dfdeaf8e69cb640a326c95ba049c9c98
---
More information about the ffmpeg-cvslog
mailing list