virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

dxva2: move _WIN32_WINNT handling to public header

Browse Source 
This removes duplicate code

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-21 13:05:16 +01:00
parent 29436c1ab2
commit b16bf913d8
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/dxva2.h
View File

@ -29,7 +29,14 @@
* Public libavcodec DXVA2 header. * Public libavcodec DXVA2 header.
*/ */
#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600
#undef _WIN32_WINNT
#endif
#if !defined(_WIN32_WINNT)
#define _WIN32_WINNT 0x0600 #define _WIN32_WINNT 0x0600
#endif
#include <stdint.h> #include <stdint.h>
#include <d3d9.h> #include <d3d9.h>
#include <dxva2api.h> #include <dxva2api.h>

8
libavcodec/dxva2_internal.h
View File

@ -23,14 +23,6 @@
#ifndef AVCODEC_DXVA_INTERNAL_H #ifndef AVCODEC_DXVA_INTERNAL_H
#define AVCODEC_DXVA_INTERNAL_H #define AVCODEC_DXVA_INTERNAL_H
#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600
#undef _WIN32_WINNT
#endif
#if !defined(_WIN32_WINNT)
#define _WIN32_WINNT 0x0600
#endif
#define COBJMACROS #define COBJMACROS
#include "config.h" #include "config.h"