Merge commit 'ec524ed12aa1aeb37125203f1adf5aa10dfcb0de'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Feb 2015 22:49:14 +0000 (23:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Feb 2015 22:49:14 +0000 (23:49 +0100)
commitbd12634d6b83e196515c52ccaa9b7513c1023b6f
treef8bf3873887649509ab0660dea8ff2436cfd8ecb
parent1dc1c4e7a82edb13420f064890fbde3751ca18c9
parentec524ed12aa1aeb37125203f1adf5aa10dfcb0de
Merge commit 'ec524ed12aa1aeb37125203f1adf5aa10dfcb0de'

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

Conflicts:
libavformat/tta.c

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