* commit 'e737a4aa':
  dashenc: Change the duration fields to 64 bit

Conflicts:
	libavformat/dashenc.c

See: e65849a7Merged-by: Michael Niedermayer <michaelni@gmx.at>