Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2' | Michael Niedermayer | 2015-03-28 | 1 | -4/+4 |
| | | | | | | | | | | | * commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2': lavc: add Intel libmfx-based H.264 encoder Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||||
* | lavc: add Intel libmfx-based H.264 encoder | Anton Khirnov | 2015-03-27 | 1 | -0/+68 |