ffmpeg | branch: master | Michael Niedermayer <michae...@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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01fc6533aa4175bad4b926361d017801aff9c53c
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
