Merge commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 10:37:24 +0000 (12:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 10:37:24 +0000 (12:37 +0200)
commit35a8387b402692933620412d41e2939aca4f6935
tree968f88f1afd209d6ea4bd782b047925ddc2a99b1
parent2ad8056c5e4c30c1c090eacad3d545a1e568235d
parent72fe16a13e3ebd5396ac173bf84c8b20085c16d5
Merge commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5'

* commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5':
  movenc: Use null buffers for measuring the amount of data to be written

Conflicts:
libavformat/movenc.c

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