Merge commit '448c8cfe4c53e9e806effd8505b46d57fa707061'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 10:42:44 +0000 (11:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 10:42:44 +0000 (11:42 +0100)
commitf8f324cc16c34d0204f2ce0d9eb20bac8b685a9c
tree0b280c37dfc2658574cf34baf38c7b11a4ae340b
parent8d026861f5c2afa3f445e2ffdc67b563b06e2dcb
parent448c8cfe4c53e9e806effd8505b46d57fa707061
Merge commit '448c8cfe4c53e9e806effd8505b46d57fa707061'

* commit '448c8cfe4c53e9e806effd8505b46d57fa707061':
  movenc: Support setting fragment_index before the moov atom is written

Conflicts:
libavformat/movenc.c

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