[FFmpeg-cvslog] Merge commit '4abfa387b8234736f6e0e541951e3d5eb60eb843'
Michael Niedermayer
git at videolan.org
Mon Feb 16 01:45:44 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 16 00:27:04 2015 +0100| [f9e76d66e93a888e79fbddc2d6bb7b778c856d20] | committer: Michael Niedermayer
Merge commit '4abfa387b8234736f6e0e541951e3d5eb60eb843'
* commit '4abfa387b8234736f6e0e541951e3d5eb60eb843':
mov: Change DTS-based seek into CTS-based seek.
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9e76d66e93a888e79fbddc2d6bb7b778c856d20
---
More information about the ffmpeg-cvslog
mailing list