* 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>