summaryrefslogtreecommitdiff
path: root/ffmpeg_dxva2.c
Commit message (Collapse)AuthorAge
* ffmpeg_dxva2: fix mixing of declarations and statementsMichael Niedermayer2014-04-29
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'Michael Niedermayer2014-04-29
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a': avconv: add support for DXVA2 decoding Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>