diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-23 16:48:41 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-23 16:48:41 +0100 |
| commit | 038e6aef7a54577a3bba6666cff21f5f4e3b2d0b (patch) | |
| tree | aa6c995c63df15efca280358172a77326700d886 /libavcodec/dxva2_hevc.c | |
| parent | 590fb5291ad434889b445e8b8d949daed97db5dd (diff) | |
| parent | 4abe3b049d987420eb891f74a35af2cebbf52144 (diff) | |
| download | ffmpeg-038e6aef7a54577a3bba6666cff21f5f4e3b2d0b.tar.gz | |
Merge commit '4abe3b049d987420eb891f74a35af2cebbf52144'
* commit '4abe3b049d987420eb891f74a35af2cebbf52144':
hevc: rename hevc.[ch] to hevcdec.[ch]
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/dxva2_hevc.c')
| -rw-r--r-- | libavcodec/dxva2_hevc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxva2_hevc.c b/libavcodec/dxva2_hevc.c index 981c8883ac..5de8b7c0a8 100644 --- a/libavcodec/dxva2_hevc.c +++ b/libavcodec/dxva2_hevc.c @@ -22,7 +22,7 @@ #include "libavutil/avassert.h" -#include "hevc.h" +#include "hevcdec.h" // The headers above may include w32threads.h, which uses the original // _WIN32_WINNT define, while dxva2_internal.h redefines it to target a |