diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 15:37:11 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 15:37:11 +0100 |
commit | 60cc4a32b52fef453d03b3c60e1d661e3fad9c05 (patch) | |
tree | c553bcd331c480fd3548e1c4d5b71137fad726e9 /libavutil/des.h | |
parent | 7b12554c5abca0eb63ddbdfdf6f11c76b9230a0c (diff) | |
parent | 215cdd35efd625ec28ef5846f1692b18f7c2c230 (diff) | |
download | ffmpeg-60cc4a32b52fef453d03b3c60e1d661e3fad9c05.tar.gz |
Merge commit '215cdd35efd625ec28ef5846f1692b18f7c2c230'
* commit '215cdd35efd625ec28ef5846f1692b18f7c2c230':
configure: Refactor dxva2api.h dependency declarations
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/des.h')
0 files changed, 0 insertions, 0 deletions