Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' | Michael Niedermayer | 2014-05-12 | 1 | -0/+134 |
* commit '1839fafa951308237c4672ffd9a94f927b26eac7': avconv: Support VDA hwaccel Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at> |