Merge commit '95ee4e2ce774e0339632d067161596bf3dadfc72'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Oct 2014 20:48:17 +0000 (22:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Oct 2014 20:48:49 +0000 (22:48 +0200)
commit687cc836ea0114b188bb088ae6df85daeb9acd4f
tree016d1be0fd26b61271f0d0e83e6e2749293547a1
parent031285dedf6638f0a84c2c4eb947d00f3fb32f2f
parent95ee4e2ce774e0339632d067161596bf3dadfc72
Merge commit '95ee4e2ce774e0339632d067161596bf3dadfc72'

* commit '95ee4e2ce774e0339632d067161596bf3dadfc72':
  movenc: Add some comments explaining subtle details in writing the edit lists

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