ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Aug 15
20:25:12 2014 +0200| [3bb22973518cbef28504e4d5b9fd74453cc3339c] | committer:
Michael Niedermayer
Merge commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6'
* commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6':
build: Add explanatory comments to (optimization) blocks in the Makefiles
Conflicts:
libavcodec/ppc/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3bb22973518cbef28504e4d5b9fd74453cc3339c
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
