xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-27 21:40:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '08377f9c3bf6dbe216512a2e05c9fac837b13fc0'

Browse Source 
* commit '08377f9c3bf6dbe216512a2e05c9fac837b13fc0':
  dxva: Include last the internal header

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-14 23:02:00 +02:00
commit b66a94ab53
4 changed files with 20 additions and 4 deletions
Show Stats 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 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "dxva2_internal.h"
#include "h264.h" #include "h264.h"
#include "h264data.h" #include "h264data.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,9 +22,13 @@
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "dxva2_internal.h"
#include "hevc.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 #define MAX_SLICES 256
struct hevc_dxva2_picture_context { struct hevc_dxva2_picture_context {

6
libavcodec/dxva2_mpeg2.c
View File

@ -21,10 +21,14 @@
*/ */
#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;

6
libavcodec/dxva2_vc1.c
View File

@ -20,11 +20,15 @@
* 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"
struct dxva2_picture_context { struct dxva2_picture_context {
DXVA_PictureParameters pp; DXVA_PictureParameters pp;
DXVA_SliceInfo si; DXVA_SliceInfo si;