[FFmpeg-cvslog] Merge commit '803f8992f11d1eb301672cd13c685a7b1d04c467'
Michael Niedermayer
git at videolan.org
Thu Sep 4 19:45:02 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 4 19:18:08 2014 +0200| [91a8b933fb6d9bf41f5885793bfcc0cb24de6100] | committer: Michael Niedermayer
Merge commit '803f8992f11d1eb301672cd13c685a7b1d04c467'
* commit '803f8992f11d1eb301672cd13c685a7b1d04c467':
build: cosmetics: Group hwaccel OBJS declarations together
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91a8b933fb6d9bf41f5885793bfcc0cb24de6100
---
More information about the ffmpeg-cvslog
mailing list