]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 817f813 6384885)
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)
* commit '63848854256a024a19435e87d6bc76fffa65e81e':
  qt-faststart: Check the ftello() return codes

Conflicts:
tools/qt-faststart.c

See: 4a2297294fa269e05aa2b3fe36b2ea231caa6dca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tools/qt-faststart.c patch | diff1 | diff2 | blob | history

diff --cc tools/qt-faststart.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.