Merge commit '63848854256a024a19435e87d6bc76fffa65e81e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 13:19:04 +0000 (14:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 13:19:04 +0000 (14:19 +0100)
commit77c235206a1b898155c9dd7ebf6ca608e295180b
tree281f314eda7404a095e76eaccad6210a98dfd791
parent817f8138cb3ef14cc6be1634d4ddd01b510c16e6
parent63848854256a024a19435e87d6bc76fffa65e81e
Merge commit '63848854256a024a19435e87d6bc76fffa65e81e'

* commit '63848854256a024a19435e87d6bc76fffa65e81e':
  qt-faststart: Check the ftello() return codes

Conflicts:
tools/qt-faststart.c

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