[FFmpeg-cvslog] Merge commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475'

Michael Niedermayer git at videolan.org
Sat Mar 1 14:10:19 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  1 13:54:35 2014 +0100| [11c4bc9a744b16b5c297b7d302c9abac1b34b689] | committer: Michael Niedermayer

Merge commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475'

* commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475':
  qt-faststart: Check fseeko() return codes

Conflicts:
	tools/qt-faststart.c

See: 0de41ead6f9034e0a834abe51028a02aee094990
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list