* commit 'ec524ed1':
  tta: Fix framepos and start_offset types

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