* commit '83f254e6':
  movenc: Rename reserved_moov_pos to reserved_header_pos

Conflicts:
	libavformat/movenc.c
	libavformat/movenc.h
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>