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)
commitd2a06242966d7a640d32d304a5653f4e1545f259
tree4bdd35d918730a77eec7a8df8daf6fd759f4dbab
parent8f3caf52fc0d75a38137d0cb97d23c8802abd1ce
parent3526ab891c28396ada8b58bf7647309bab30de1d
Merge commit '3526ab891c28396ada8b58bf7647309bab30de1d'

* commit '3526ab891c28396ada8b58bf7647309bab30de1d':
  qt-faststart: Undefine fseeko/ftello before defining them

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