virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

dxva: Include last the internal header

Browse Source 
It redefines _WIN32_WINNT, possibly causing problems with the
w32pthreads.h header.
This commit is contained in:
Luca Barbato
2015-10-13 23:20:33 +02:00
parent c134850669
commit 08377f9c3b
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dxva2_h264.c
View File

@@ -20,11 +20,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "dxva2_internal.h"
#include "h264.h"
#include "h264data.h"
#include "mpegutils.h"
// The headers above may include w32threads.h, which uses the original
// _WIN32_WINNT define, while dxva2_internal.h redefines it to target a
// potentially newer version.
#include "dxva2_internal.h"
struct dxva2_picture_context {
DXVA_PicParams_H264 pp;
DXVA_Qmatrix_H264 qm;

6
libavcodec/dxva2_hevc.c
View File

@@ -22,9 +22,13 @@
#include "libavutil/avassert.h"
#include "dxva2_internal.h"
#include "hevc.h"
// The headers above may include w32threads.h, which uses the original
// _WIN32_WINNT define, while dxva2_internal.h redefines it to target a
// potentially newer version.
#include "dxva2_internal.h"
#define MAX_SLICES 256
struct hevc_dxva2_picture_context {

6
libavcodec/dxva2_mpeg2.c
View File

@@ -21,10 +21,14 @@
*/
#include "libavutil/log.h"
#include "dxva2_internal.h"
#include "mpegutils.h"
#include "mpegvideo.h"
// The headers above may include w32threads.h, which uses the original
// _WIN32_WINNT define, while dxva2_internal.h redefines it to target a
// potentially newer version.
#include "dxva2_internal.h"
#define MAX_SLICES 1024
struct dxva2_picture_context {
DXVA_PictureParameters pp;

6
libavcodec/dxva2_vc1.c
View File

@@ -20,11 +20,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "dxva2_internal.h"
#include "mpegutils.h"
#include "vc1.h"
#include "vc1data.h"
// The headers above may include w32threads.h, which uses the original
// _WIN32_WINNT define, while dxva2_internal.h redefines it to target a
// potentially newer version.
#include "dxva2_internal.h"
struct dxva2_picture_context {
DXVA_PictureParameters pp;
DXVA_SliceInfo si;