ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Mar 2
20:52:34 2015 +0100| [cb39fe9336539f7a88c5ac8e2ad6c840338c0306] | committer:
Michael Niedermayer
Merge commit '91eee2af87278b3c2008f7a86d2cdfe6934e9f42'
* commit '91eee2af87278b3c2008f7a86d2cdfe6934e9f42':
Revert "mov: Change DTS-based seek into CTS-based seek."
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb39fe9336539f7a88c5ac8e2ad6c840338c0306
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
