Merge commit '4abfa387b8234736f6e0e541951e3d5eb60eb843'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 23:27:04 +0000 (00:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 00:28:02 +0000 (01:28 +0100)
commitf9e76d66e93a888e79fbddc2d6bb7b778c856d20
treefd2968bf8b8005322a43cb75459033de96e407b9
parent7b564a4cbb447362e9160dde58f4fdb9f3097431
parent4abfa387b8234736f6e0e541951e3d5eb60eb843
Merge commit '4abfa387b8234736f6e0e541951e3d5eb60eb843'

* commit '4abfa387b8234736f6e0e541951e3d5eb60eb843':
  mov: Change DTS-based seek into CTS-based seek.

Conflicts:
libavformat/mov.c

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