openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-27 05:00:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce'

Browse Source 
* commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce':
  Drop Windows XP support remnants

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-04-13 20:59:12 -03:00
commit b14761d1f8
7 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dxva2_h264.c
View File

@ -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;

6
libavcodec/dxva2_hevc.c
View File

@ -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 {

7
libavcodec/dxva2_mpeg2.c
View File

@ -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;

7
libavcodec/dxva2_vc1.c
View File

@ -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;

6
libavcodec/dxva2_vp9.c
View File

@ -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;

9
libavutil/hwcontext_d3d11va.c
View File

@ -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);

4
libavutil/hwcontext_dxva2.c
View File

@ -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