mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
Merge commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce'
* commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce': Drop Windows XP support remnants Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
b14761d1f8
@ -22,16 +22,12 @@
|
|||||||
|
|
||||||
#include "libavutil/avassert.h"
|
#include "libavutil/avassert.h"
|
||||||
|
|
||||||
|
#include "dxva2_internal.h"
|
||||||
#include "h264dec.h"
|
#include "h264dec.h"
|
||||||
#include "h264data.h"
|
#include "h264data.h"
|
||||||
#include "h264_ps.h"
|
#include "h264_ps.h"
|
||||||
#include "mpegutils.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 {
|
struct dxva2_picture_context {
|
||||||
DXVA_PicParams_H264 pp;
|
DXVA_PicParams_H264 pp;
|
||||||
DXVA_Qmatrix_H264 qm;
|
DXVA_Qmatrix_H264 qm;
|
||||||
|
@ -22,14 +22,10 @@
|
|||||||
|
|
||||||
#include "libavutil/avassert.h"
|
#include "libavutil/avassert.h"
|
||||||
|
|
||||||
|
#include "dxva2_internal.h"
|
||||||
#include "hevc_data.h"
|
#include "hevc_data.h"
|
||||||
#include "hevcdec.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
|
|
||||||
// potentially newer version.
|
|
||||||
#include "dxva2_internal.h"
|
|
||||||
|
|
||||||
#define MAX_SLICES 256
|
#define MAX_SLICES 256
|
||||||
|
|
||||||
struct hevc_dxva2_picture_context {
|
struct hevc_dxva2_picture_context {
|
||||||
|
@ -21,14 +21,11 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libavutil/log.h"
|
#include "libavutil/log.h"
|
||||||
|
|
||||||
|
#include "dxva2_internal.h"
|
||||||
#include "mpegutils.h"
|
#include "mpegutils.h"
|
||||||
#include "mpegvideo.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
|
#define MAX_SLICES 1024
|
||||||
struct dxva2_picture_context {
|
struct dxva2_picture_context {
|
||||||
DXVA_PictureParameters pp;
|
DXVA_PictureParameters pp;
|
||||||
|
@ -20,16 +20,13 @@
|
|||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "dxva2_internal.h"
|
||||||
#include "mpegutils.h"
|
#include "mpegutils.h"
|
||||||
#include "vc1.h"
|
#include "vc1.h"
|
||||||
#include "vc1data.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"
|
|
||||||
|
|
||||||
#define MAX_SLICES 1024
|
#define MAX_SLICES 1024
|
||||||
|
|
||||||
struct dxva2_picture_context {
|
struct dxva2_picture_context {
|
||||||
DXVA_PictureParameters pp;
|
DXVA_PictureParameters pp;
|
||||||
unsigned slice_count;
|
unsigned slice_count;
|
||||||
|
@ -23,12 +23,8 @@
|
|||||||
#include "libavutil/avassert.h"
|
#include "libavutil/avassert.h"
|
||||||
#include "libavutil/pixdesc.h"
|
#include "libavutil/pixdesc.h"
|
||||||
|
|
||||||
#include "vp9shared.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"
|
#include "dxva2_internal.h"
|
||||||
|
#include "vp9shared.h"
|
||||||
|
|
||||||
struct vp9_dxva2_picture_context {
|
struct vp9_dxva2_picture_context {
|
||||||
DXVA_PicParams_VP9 pp;
|
DXVA_PicParams_VP9 pp;
|
||||||
|
@ -20,14 +20,6 @@
|
|||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|
||||||
// Include thread.h before redefining _WIN32_WINNT, to get
|
|
||||||
// the right implementation for AVOnce
|
|
||||||
#include "thread.h"
|
|
||||||
|
|
||||||
#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600
|
|
||||||
#undef _WIN32_WINNT
|
|
||||||
#define _WIN32_WINNT 0x0600
|
|
||||||
#endif
|
|
||||||
#define COBJMACROS
|
#define COBJMACROS
|
||||||
|
|
||||||
#include <initguid.h>
|
#include <initguid.h>
|
||||||
@ -46,6 +38,7 @@
|
|||||||
#include "imgutils.h"
|
#include "imgutils.h"
|
||||||
#include "pixdesc.h"
|
#include "pixdesc.h"
|
||||||
#include "pixfmt.h"
|
#include "pixfmt.h"
|
||||||
|
#include "thread.h"
|
||||||
|
|
||||||
typedef HRESULT(WINAPI *PFN_CREATE_DXGI_FACTORY)(REFIID riid, void **ppFactory);
|
typedef HRESULT(WINAPI *PFN_CREATE_DXGI_FACTORY)(REFIID riid, void **ppFactory);
|
||||||
|
|
||||||
|
@ -18,10 +18,6 @@
|
|||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|
||||||
#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600
|
|
||||||
#undef _WIN32_WINNT
|
|
||||||
#define _WIN32_WINNT 0x0600
|
|
||||||
#endif
|
|
||||||
#define DXVA2API_USE_BITFIELDS
|
#define DXVA2API_USE_BITFIELDS
|
||||||
#define COBJMACROS
|
#define COBJMACROS
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user