* commit '9cbf70fa':
  movenc: Write correct presentation timestamps in tfra

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