[FFmpeg-cvslog] Merge commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 20 12:37:24 2013 +0200| [35a8387b402692933620412d41e2939aca4f6935] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35a8387b402692933620412d41e2939aca4f6935
---