summaryrefslogtreecommitdiff
path: root/ffmpeg_dxva2.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643'Michael Niedermayer2014-04-301-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 statementsMichael Niedermayer2014-04-291-1/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'Michael Niedermayer2014-04-291-0/+618
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a': avconv: add support for DXVA2 decoding Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>