[FFmpeg-cvslog] Merge commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e'
Michael Niedermayer
git at videolan.org
Mon Oct 13 01:14:57 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 13 01:10:13 2014 +0200| [20a66868a25bf7719e73ba7c6bbbe59a0f7f77b7] | committer: Michael Niedermayer
Merge commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e'
* commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e':
movenc: Print a warning for an unhandled case of nonzero start dts with empty_moov
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20a66868a25bf7719e73ba7c6bbbe59a0f7f77b7
---
More information about the ffmpeg-cvslog
mailing list