[FFmpeg-cvslog] Merge commit 'c725faebda9a516766d94c33b07972ab0f70cf93'
Michael Niedermayer
git at videolan.org
Sat Jan 3 03:06:58 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 3 01:38:58 2015 +0100| [0506f687e8771c2bc3cddf4c9bc3ad77e37f69f2] | committer: Michael Niedermayer
Merge commit 'c725faebda9a516766d94c33b07972ab0f70cf93'
* commit 'c725faebda9a516766d94c33b07972ab0f70cf93':
movenc: Use start_dts/cts instead of cluster[0] for writing edit lists
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0506f687e8771c2bc3cddf4c9bc3ad77e37f69f2
---
More information about the ffmpeg-cvslog
mailing list