Merge commit '91eee2af87278b3c2008f7a86d2cdfe6934e9f42'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Mar 2015 19:52:34 +0000 (20:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Mar 2015 19:52:34 +0000 (20:52 +0100)
commitcb39fe9336539f7a88c5ac8e2ad6c840338c0306
treeaeb1d8ccebca623a8ddfa80ea6f54e430c561a5a
parent82fe4072ea4251d47167017b3223928279a5abab
parent91eee2af87278b3c2008f7a86d2cdfe6934e9f42
Merge commit '91eee2af87278b3c2008f7a86d2cdfe6934e9f42'

* commit '91eee2af87278b3c2008f7a86d2cdfe6934e9f42':
  Revert "mov: Change DTS-based seek into CTS-based seek."

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mov.c