Merge commit '573b1de2d7f1db71030f91ecdded7d0bc071f6b6'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Oct 2014 01:15:39 +0000 (02:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Oct 2014 01:17:54 +0000 (02:17 +0100)
commit647405d1110cb083e96d892646d2d1367946e39a
tree9d337de694a462f3fa54e657cbf343b1772d0c76
parent32e666c354e4a3160d8cf1d303cb51990b095c87
parent573b1de2d7f1db71030f91ecdded7d0bc071f6b6
Merge commit '573b1de2d7f1db71030f91ecdded7d0bc071f6b6'

* commit '573b1de2d7f1db71030f91ecdded7d0bc071f6b6':
  movenc: Don't use track_id to decide which track is the first in a moof

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