[FFmpeg-cvslog] Merge commit 'ec524ed12aa1aeb37125203f1adf5aa10dfcb0de'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb  3 23:49:14 2015 +0100| [bd12634d6b83e196515c52ccaa9b7513c1023b6f] | committer: Michael Niedermayer

Merge commit 'ec524ed12aa1aeb37125203f1adf5aa10dfcb0de'

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

Conflicts:
	libavformat/tta.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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