Merge commit '3526ab891c28396ada8b58bf7647309bab30de1d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Aug 2014 19:55:00 +0000 (21:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Aug 2014 19:55:27 +0000 (21:55 +0200)
* commit '3526ab891c28396ada8b58bf7647309bab30de1d':
  qt-faststart: Undefine fseeko/ftello before defining them

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tools/qt-faststart.c

Simple merge