[FFmpeg-cvslog] Merge commit '63848854256a024a19435e87d6bc76fffa65e81e'

Michael Niedermayer git at videolan.org
Sat Mar 1 14:30:57 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  1 14:19:04 2014 +0100| [77c235206a1b898155c9dd7ebf6ca608e295180b] | committer: Michael Niedermayer

Merge commit '63848854256a024a19435e87d6bc76fffa65e81e'

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

Conflicts:
	tools/qt-faststart.c

See: 4a2297294fa269e05aa2b3fe36b2ea231caa6dca
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77c235206a1b898155c9dd7ebf6ca608e295180b
---





More information about the ffmpeg-cvslog mailing list