Merge commit 'a4adabb460ace39783d707a5b3bbe28b4b5b9dc4'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 10:47:47 +0000 (12:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 10:47:55 +0000 (12:47 +0200)
* commit 'a4adabb460ace39783d707a5b3bbe28b4b5b9dc4':
  movenc: Write the moof atom in two passes

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

Simple merge
Simple merge