Merge commit 'f90729699db9ede2bef2b28000f1795dab1b8996'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 10:41:57 +0000 (12:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 10:41:57 +0000 (12:41 +0200)
commit4c91599484e115e9b51c884fc46cea3f8511f8ae
tree9ca391deefa9c064825e57daa2b3b9868969d5c4
parente1f4397e74f0a21c10e74eabb87f6fe601d6791f
parentf90729699db9ede2bef2b28000f1795dab1b8996
Merge commit 'f90729699db9ede2bef2b28000f1795dab1b8996'

* commit 'f90729699db9ede2bef2b28000f1795dab1b8996':
  mov: Do not group tracks if more than one is enabled per type

Conflicts:
libavformat/movenc.c

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