Merge commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Aug 2013 11:42:47 +0000 (13:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Aug 2013 11:58:23 +0000 (13:58 +0200)
commit606a30c5a11522130658e0807b340ce922a390a6
treedc512be593b28a155b554eb7c709f481c43c4256
parentd68adbd666cbc1180380034324d86cb31f1f77ae
parentfe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e
Merge commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e'

* commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e':
  movenc: Make chapter track QuickTime compatible

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