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)
commit66e199bd7532a8b497e4ab8611768099c8f8daf8
tree0e2f4689c376bd9f5f6c6e7241fff98c93a1d86d
parent015f7ce7d7dfac0469dbacc5022840cd0bf225fc
parenta4adabb460ace39783d707a5b3bbe28b4b5b9dc4
Merge commit 'a4adabb460ace39783d707a5b3bbe28b4b5b9dc4'

* commit 'a4adabb460ace39783d707a5b3bbe28b4b5b9dc4':
  movenc: Write the moof atom in two passes

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