[FFmpeg-cvslog] Merge commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae'
Michael Niedermayer
git at videolan.org
Thu Dec 11 02:20:08 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 11 02:03:08 2014 +0100| [7ee5f764ee6cbdff67e04f7959acedff80fcd59b] | committer: Michael Niedermayer
Merge commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae'
* commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae':
dashenc: Change the duration fields to 64 bit
Conflicts:
libavformat/dashenc.c
See: e65849a70bfb401306038d41ebd8b5750deb3cfd
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ee5f764ee6cbdff67e04f7959acedff80fcd59b
---
More information about the ffmpeg-cvslog
mailing list