[FFmpeg-cvslog] Merge commit '3526ab891c28396ada8b58bf7647309bab30de1d'

Michael Niedermayer git at videolan.org
Fri Aug 22 22:01:22 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 22 21:55:00 2014 +0200| [d2a06242966d7a640d32d304a5653f4e1545f259] | committer: Michael Niedermayer

Merge commit '3526ab891c28396ada8b58bf7647309bab30de1d'

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

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

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





More information about the ffmpeg-cvslog mailing list