[FFmpeg-cvslog] Merge commit '07d8fa58121be8fe315bd51ab760547fe209a745'
Michael Niedermayer
git at videolan.org
Mon Aug 4 04:04:58 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 4 03:51:17 2014 +0200| [01fc6533aa4175bad4b926361d017801aff9c53c] | committer: Michael Niedermayer
Merge commit '07d8fa58121be8fe315bd51ab760547fe209a745'
* commit '07d8fa58121be8fe315bd51ab760547fe209a745':
fate: add informative cpu test
Conflicts:
tests/fate/libavutil.mak
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01fc6533aa4175bad4b926361d017801aff9c53c
---
More information about the ffmpeg-cvslog
mailing list