Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' | Michael Niedermayer | 2014-04-30 | 1 | -13/+14 |
| | | | | | | | * commit 'a7c5fddac8137654cb503295c4dfb6492df43643': avconv_dxva2: define all used GUIDs directly instead of relying on the dxva2api.h header Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||||
* | ffmpeg_dxva2: fix mixing of declarations and statements | Michael Niedermayer | 2014-04-29 | 1 | -1/+2 |
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | ||||
* | Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a' | Michael Niedermayer | 2014-04-29 | 1 | -0/+618 |
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a': avconv: add support for DXVA2 decoding Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at> |