[FFmpeg-cvslog] Merge commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64'

Michael Niedermayer git at videolan.org
Wed Feb 5 23:59:50 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  5 23:48:15 2014 +0100| [a3be0c334e8ba7e447a734aa2be862815e5daf85] | committer: Michael Niedermayer

Merge commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64'

* commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64':
  lavu: add missing log.h include in timer.h

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

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





More information about the ffmpeg-cvslog mailing list