Merge commit '0f9eb9165bb7d7982fdedf64f6bcec856f1bedd6'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 20:21:38 +0000 (21:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 20:22:47 +0000 (21:22 +0100)
* commit '0f9eb9165bb7d7982fdedf64f6bcec856f1bedd6':
  movenc: Include empty tracks in iods when writing fragmented mp4

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

Simple merge