Merge commit 'c725faebda9a516766d94c33b07972ab0f70cf93'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Jan 2015 00:38:58 +0000 (01:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Jan 2015 00:38:58 +0000 (01:38 +0100)
commit0506f687e8771c2bc3cddf4c9bc3ad77e37f69f2
tree9095cbd6fbdd8a0f5b7264bd85ed7276a20b95e8
parent68a06a244c06cd7caa6ed724c7cfbd2dbd7725b8
parentc725faebda9a516766d94c33b07972ab0f70cf93
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@gmx.at>
libavformat/movenc.c