/[packages]/cauldron/xbmc/current/SOURCES/0104-Drop-patch-for-win32-build.patch
ViewVC logotype

Contents of /cauldron/xbmc/current/SOURCES/0104-Drop-patch-for-win32-build.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 269300 - (show annotations) (download)
Tue Jul 10 19:13:54 2012 UTC (11 years, 9 months ago) by anssi
File size: 23711 byte(s) 
- fix missing include in wiiremote eventclient
  (wiiremote-missing-include.patch)
- backport FFmpeg support patches to allow build with cauldron ffmpeg
  (patches 101..145)
1 From 502eafcb00f717ea9070814eb79203b931e48050 Mon Sep 17 00:00:00 2001
2 From: elupus <elupus@xbmc.org>
3 Date: Thu, 29 Mar 2012 21:12:31 +0200
4 Subject: [PATCH 104/145] Drop patch for win32 build
5
6 These scripts should not be in the ffmpeg build dir
7 (cherry picked from commit 332025963226e3fe8b609ad18ecc69201a6dbbcf)
8 ---
9 ...026-add-files-needed-for-xbmc-win32-build.patch | 606 --------------------
10 1 file changed, 606 deletions(-)
11 delete mode 100644 lib/ffmpeg/patches/0026-add-files-needed-for-xbmc-win32-build.patch
12
13 diff --git a/lib/ffmpeg/patches/0026-add-files-needed-for-xbmc-win32-build.patch b/lib/ffmpeg/patches/0026-add-files-needed-for-xbmc-win32-build.patch
14 deleted file mode 100644
15 index a0344ef..0000000
16 --- a/lib/ffmpeg/patches/0026-add-files-needed-for-xbmc-win32-build.patch
17 +++ /dev/null
18 @@ -1,606 +0,0 @@
19 -From 5931c5bb05da02fa495d99b3b7e86239a2b79374 Mon Sep 17 00:00:00 2001
20 -From: Anssi Hannula <anssi.hannula@iki.fi>
21 -Date: Fri, 4 Feb 2011 12:38:15 +0200
22 -Subject: [PATCH] add files needed for xbmc win32 build
23 -
24 ----
25 - .gitignore | 5 +
26 - build_xbmc_win32.sh | 49 +++
27 - include-xbmc-win32/dxva2/dxva2api.h | 502 +++++++++++++++++++++++++++++++
28 - include-xbmc-win32/libavutil/avconfig.h | 6 +
29 - 4 files changed, 562 insertions(+), 0 deletions(-)
30 - create mode 100644 build_xbmc_win32.sh
31 - create mode 100644 include-xbmc-win32/dxva2/dxva2api.h
32 - create mode 100644 include-xbmc-win32/libavutil/avconfig.h
33 -
34 -diff --git a/.gitignore b/.gitignore
35 -index eac1758..70b94fc 100644
36 ---- a/.gitignore
37 -+++ b/.gitignore
38 -@@ -43,3 +43,8 @@ tools/qt-faststart
39 - tools/trasher
40 - tools/trasher*.d
41 - version.h
42 -+
43 -+# ignore Windows build files
44 -+*.def
45 -+*.dll
46 -+*.lib
47 -diff --git a/build_xbmc_win32.sh b/build_xbmc_win32.sh
48 -new file mode 100644
49 -index 0000000..5befc5a
50 ---- /dev/null
51 -+++ b/build_xbmc_win32.sh
52 -@@ -0,0 +1,49 @@
53 -+#!/bin/bash
54 -+
55 -+if [ -d .libs ]
56 -+then
57 -+rm -r .libs
58 -+fi
59 -+
60 -+if [ -f config.mak ]
61 -+then
62 -+make distclean
63 -+fi
64 -+
65 -+OPTIONS="
66 -+--enable-shared \
67 -+--enable-memalign-hack \
68 -+--enable-gpl \
69 -+--enable-w32threads \
70 -+--enable-postproc \
71 -+--enable-zlib \
72 -+--disable-static \
73 -+--disable-altivec \
74 -+--disable-muxers \
75 -+--disable-encoders \
76 -+--disable-debug \
77 -+--disable-ffplay \
78 -+--disable-ffserver \
79 -+--disable-ffmpeg \
80 -+--disable-ffprobe \
81 -+--disable-devices \
82 -+--enable-muxer=spdif \
83 -+--enable-muxer=adts \
84 -+--enable-encoder=ac3 \
85 -+--enable-encoder=aac \
86 -+--enable-runtime-cpudetect \
87 -+--disable-debug \
88 -+--disable-doc"
89 -+
90 -+./configure --extra-cflags="-fno-common -Iinclude-xbmc-win32/dxva2" --extra-ldflags="-L/xbmc/system/players/dvdplayer" ${OPTIONS} &&
91 -+
92 -+make &&
93 -+mkdir .libs &&
94 -+cp lib*/*.dll .libs/ &&
95 -+mv .libs/swscale-0.dll .libs/swscale-0.6.1.dll &&
96 -+cp .libs/avcodec-52.dll /xbmc/system/players/dvdplayer/ &&
97 -+cp .libs/avcore-0.dll /xbmc/system/players/dvdplayer/ &&
98 -+cp .libs/avformat-52.dll /xbmc/system/players/dvdplayer/ &&
99 -+cp .libs/avutil-50.dll /xbmc/system/players/dvdplayer/ &&
100 -+cp .libs/postproc-51.dll /xbmc/system/players/dvdplayer/ &&
101 -+cp .libs/swscale-0.6.1.dll /xbmc/system/players/dvdplayer/
102 -diff --git a/include-xbmc-win32/dxva2/dxva2api.h b/include-xbmc-win32/dxva2/dxva2api.h
103 -new file mode 100644
104 -index 0000000..28e54c8
105 ---- /dev/null
106 -+++ b/include-xbmc-win32/dxva2/dxva2api.h
107 -@@ -0,0 +1,502 @@
108 -+/*****************************************************************************
109 -+ * dxva2api.h: DXVA 2 interface
110 -+ *****************************************************************************
111 -+ * Copyright (C) 2009 Geoffroy Couprie
112 -+ * Copyright (C) 2009 Laurent Aimar
113 -+ * $Id$
114 -+ *
115 -+ * Authors: Geoffroy Couprie <geal _AT_ videolan _DOT_ org>
116 -+ * Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
117 -+ *
118 -+ * This program is free software; you can redistribute it and/or modify
119 -+ * it under the terms of the GNU General Public License as published by
120 -+ * the Free Software Foundation; either version 2 of the License, or
121 -+ * (at your option) any later version.
122 -+ *
123 -+ * This program is distributed in the hope that it will be useful,
124 -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
125 -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
126 -+ * GNU General Public License for more details.
127 -+ *
128 -+ * You should have received a copy of the GNU General Public License
129 -+ * along with this program; if not, write to the Free Software
130 -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
131 -+ *****************************************************************************/
132 -+
133 -+#ifndef _DXVA2API_H
134 -+#define _DXVA2API_H
135 -+
136 -+#define MINGW_DXVA2API_H_VERSION (2)
137 -+
138 -+#if __GNUC__ >=3
139 -+#pragma GCC system_header
140 -+#endif
141 -+
142 -+#include <objbase.h>
143 -+#include <d3d9.h>
144 -+
145 -+/* Define it to allow using nameless struct/union (non C99 compliant) to match
146 -+ * the official documentation. */
147 -+//#define DXVA2API_USE_BITFIELDS
148 -+
149 -+/****************STRUCTURES******************/
150 -+#pragma pack(push, 1)
151 -+
152 -+typedef struct _DXVA2_ExtendedFormat {
153 -+#ifdef DXVA2API_USE_BITFIELDS
154 -+ union {
155 -+ struct {
156 -+ UINT SampleFormat : 8;
157 -+ UINT VideoChromaSubsampling : 4;
158 -+ UINT NominalRange : 3;
159 -+ UINT VideoTransferMatrix : 3;
160 -+ UINT VideoLighting : 4;
161 -+ UINT VideoPrimaries : 5;
162 -+ UINT VideoTransferFunction : 5;
163 -+ };
164 -+ UINT value;
165 -+ };
166 -+#else
167 -+ UINT value;
168 -+#endif
169 -+} DXVA2_ExtendedFormat;
170 -+
171 -+typedef struct _DXVA2_Frequency {
172 -+ UINT Numerator;
173 -+ UINT Denominator;
174 -+} DXVA2_Frequency;
175 -+
176 -+typedef struct _DXVA2_VideoDesc {
177 -+ UINT SampleWidth;
178 -+ UINT SampleHeight;
179 -+ DXVA2_ExtendedFormat SampleFormat;
180 -+ D3DFORMAT Format;
181 -+ DXVA2_Frequency InputSampleFreq;
182 -+ DXVA2_Frequency OutputFrameFreq;
183 -+ UINT UABProtectionLevel;
184 -+ UINT Reserved;
185 -+} DXVA2_VideoDesc;
186 -+
187 -+typedef struct _DXVA2_ConfigPictureDecode {
188 -+ GUID guidConfigBitstreamEncryption;
189 -+ GUID guidConfigMBcontrolEncryption;
190 -+ GUID guidConfigResidDiffEncryption;
191 -+ UINT ConfigBitstreamRaw;
192 -+ UINT ConfigMBcontrolRasterOrder;
193 -+ UINT ConfigResidDiffHost;
194 -+ UINT ConfigSpatialResid8;
195 -+ UINT ConfigResid8Subtraction;
196 -+ UINT ConfigSpatialHost8or9Clipping;
197 -+ UINT ConfigSpatialResidInterleaved;
198 -+ UINT ConfigIntraResidUnsigned;
199 -+ UINT ConfigResidDiffAccelerator;
200 -+ UINT ConfigHostInverseScan;
201 -+ UINT ConfigSpecificIDCT;
202 -+ UINT Config4GroupedCoefs;
203 -+ USHORT ConfigMinRenderTargetBuffCount;
204 -+ USHORT ConfigDecoderSpecific;
205 -+} DXVA2_ConfigPictureDecode;
206 -+
207 -+typedef struct _DXVA2_DecodeBufferDesc {
208 -+ DWORD CompressedBufferType;
209 -+ UINT BufferIndex;
210 -+ UINT DataOffset;
211 -+ UINT DataSize;
212 -+ UINT FirstMBaddress;
213 -+ UINT NumMBsInBuffer;
214 -+ UINT Width;
215 -+ UINT Height;
216 -+ UINT Stride;
217 -+ UINT ReservedBits;
218 -+ PVOID pvPVPState;
219 -+} DXVA2_DecodeBufferDesc;
220 -+
221 -+typedef struct _DXVA2_DecodeExtensionData {
222 -+ UINT Function;
223 -+ PVOID pPrivateInputData;
224 -+ UINT PrivateInputDataSize;
225 -+ PVOID pPrivateOutputData;
226 -+ UINT PrivateOutputDataSize;
227 -+} DXVA2_DecodeExtensionData;
228 -+
229 -+typedef struct _DXVA2_DecodeExecuteParams {
230 -+ UINT NumCompBuffers;
231 -+ DXVA2_DecodeBufferDesc *pCompressedBuffers;
232 -+ DXVA2_DecodeExtensionData *pExtensionData;
233 -+} DXVA2_DecodeExecuteParams;
234 -+
235 -+enum {
236 -+ DXVA2_VideoDecoderRenderTarget = 0,
237 -+ DXVA2_VideoProcessorRenderTarget = 1,
238 -+ DXVA2_VideoSoftwareRenderTarget = 2
239 -+};
240 -+
241 -+enum {
242 -+ DXVA2_PictureParametersBufferType = 0,
243 -+ DXVA2_MacroBlockControlBufferType = 1,
244 -+ DXVA2_ResidualDifferenceBufferType = 2,
245 -+ DXVA2_DeblockingControlBufferType = 3,
246 -+ DXVA2_InverseQuantizationMatrixBufferType = 4,
247 -+ DXVA2_SliceControlBufferType = 5,
248 -+ DXVA2_BitStreamDateBufferType = 6,
249 -+ DXVA2_MotionVectorBuffer = 7,
250 -+ DXVA2_FilmGrainBuffer = 8
251 -+};
252 -+
253 -+/* DXVA MPEG-I/II and VC-1 */
254 -+typedef struct _DXVA_PictureParameters {
255 -+ USHORT wDecodedPictureIndex;
256 -+ USHORT wDeblockedPictureIndex;
257 -+ USHORT wForwardRefPictureIndex;
258 -+ USHORT wBackwardRefPictureIndex;
259 -+ USHORT wPicWidthInMBminus1;
260 -+ USHORT wPicHeightInMBminus1;
261 -+ UCHAR bMacroblockWidthMinus1;
262 -+ UCHAR bMacroblockHeightMinus1;
263 -+ UCHAR bBlockWidthMinus1;
264 -+ UCHAR bBlockHeightMinus1;
265 -+ UCHAR bBPPminus1;
266 -+ UCHAR bPicStructure;
267 -+ UCHAR bSecondField;
268 -+ UCHAR bPicIntra;
269 -+ UCHAR bPicBackwardPrediction;
270 -+ UCHAR bBidirectionalAveragingMode;
271 -+ UCHAR bMVprecisionAndChromaRelation;
272 -+ UCHAR bChromaFormat;
273 -+ UCHAR bPicScanFixed;
274 -+ UCHAR bPicScanMethod;
275 -+ UCHAR bPicReadbackRequests;
276 -+ UCHAR bRcontrol;
277 -+ UCHAR bPicSpatialResid8;
278 -+ UCHAR bPicOverflowBlocks;
279 -+ UCHAR bPicExtrapolation;
280 -+ UCHAR bPicDeblocked;
281 -+ UCHAR bPicDeblockConfined;
282 -+ UCHAR bPic4MVallowed;
283 -+ UCHAR bPicOBMC;
284 -+ UCHAR bPicBinPB;
285 -+ UCHAR bMV_RPS;
286 -+ UCHAR bReservedBits;
287 -+ USHORT wBitstreamFcodes;
288 -+ USHORT wBitstreamPCEelements;
289 -+ UCHAR bBitstreamConcealmentNeed;
290 -+ UCHAR bBitstreamConcealmentMethod;
291 -+} DXVA_PictureParameters, *LPDXVA_PictureParameters;
292 -+
293 -+typedef struct _DXVA_QmatrixData {
294 -+ BYTE bNewQmatrix[4];
295 -+ WORD Qmatrix[4][8 * 8];
296 -+} DXVA_QmatrixData, *LPDXVA_QmatrixData;
297 -+
298 -+typedef struct _DXVA_SliceInfo {
299 -+ USHORT wHorizontalPosition;
300 -+ USHORT wVerticalPosition;
301 -+ UINT dwSliceBitsInBuffer;
302 -+ UINT dwSliceDataLocation;
303 -+ UCHAR bStartCodeBitOffset;
304 -+ UCHAR bReservedBits;
305 -+ USHORT wMBbitOffset;
306 -+ USHORT wNumberMBsInSlice;
307 -+ USHORT wQuantizerScaleCode;
308 -+ USHORT wBadSliceChopping;
309 -+} DXVA_SliceInfo, *LPDXVA_SliceInfo;
310 -+
311 -+/* DXVA H264 */
312 -+typedef struct {
313 -+#ifdef DXVA2API_USE_BITFIELDS
314 -+ union {
315 -+ struct {
316 -+ UCHAR Index7Bits : 7;
317 -+ UCHAR AssociatedFlag : 1;
318 -+ };
319 -+ UCHAR bPicEntry;
320 -+ };
321 -+#else
322 -+ UCHAR bPicEntry;
323 -+#endif
324 -+} DXVA_PicEntry_H264;
325 -+
326 -+
327 -+typedef struct {
328 -+ USHORT wFrameWidthInMbsMinus1;
329 -+ USHORT wFrameHeightInMbsMinus1;
330 -+ DXVA_PicEntry_H264 CurrPic;
331 -+ UCHAR num_ref_frames;
332 -+#ifdef DXVA2API_USE_BITFIELDS
333 -+ union {
334 -+ struct {
335 -+ USHORT field_pic_flag : 1;
336 -+ USHORT MbaffFrameFlag : 1;
337 -+ USHORT residual_colour_transform_flag : 1;
338 -+ USHORT sp_for_switch_flag : 1;
339 -+ USHORT chroma_format_idc : 2;
340 -+ USHORT RefPicFlag : 1;
341 -+ USHORT constrained_intra_pred_flag : 1;
342 -+ USHORT weighted_pred_flag : 1;
343 -+ USHORT weighted_bipred_idc : 2;
344 -+ USHORT MbsConsecutiveFlag : 1;
345 -+ USHORT frame_mbs_only_flag : 1;
346 -+ USHORT transform_8x8_mode_flag : 1;
347 -+ USHORT MinLumaBipredSize8x8Flag : 1;
348 -+ USHORT IntraPicFlag : 1;
349 -+ };
350 -+ USHORT wBitFields;
351 -+ };
352 -+#else
353 -+ USHORT wBitFields;
354 -+#endif
355 -+ UCHAR bit_depth_luma_minus8;
356 -+ UCHAR bit_depth_chroma_minus8;
357 -+ USHORT Reserved16Bits;
358 -+ UINT StatusReportFeedbackNumber;
359 -+ DXVA_PicEntry_H264 RefFrameList[16];
360 -+ INT CurrFieldOrderCnt[2];
361 -+ INT FieldOrderCntList[16][2];
362 -+ CHAR pic_init_qs_minus26;
363 -+ CHAR chroma_qp_index_offset;
364 -+ CHAR second_chroma_qp_index_offset;
365 -+ UCHAR ContinuationFlag;
366 -+ CHAR pic_init_qp_minus26;
367 -+ UCHAR num_ref_idx_l0_active_minus1;
368 -+ UCHAR num_ref_idx_l1_active_minus1;
369 -+ UCHAR Reserved8BitsA;
370 -+ USHORT FrameNumList[16];
371 -+
372 -+ UINT UsedForReferenceFlags;
373 -+ USHORT NonExistingFrameFlags;
374 -+ USHORT frame_num;
375 -+ UCHAR log2_max_frame_num_minus4;
376 -+ UCHAR pic_order_cnt_type;
377 -+ UCHAR log2_max_pic_order_cnt_lsb_minus4;
378 -+ UCHAR delta_pic_order_always_zero_flag;
379 -+ UCHAR direct_8x8_inference_flag;
380 -+ UCHAR entropy_coding_mode_flag;
381 -+ UCHAR pic_order_present_flag;
382 -+ UCHAR num_slice_groups_minus1;
383 -+ UCHAR slice_group_map_type;
384 -+ UCHAR deblocking_filter_control_present_flag;
385 -+ UCHAR redundant_pic_cnt_present_flag;
386 -+ UCHAR Reserved8BitsB;
387 -+ USHORT slice_group_change_rate_minus1;
388 -+ UCHAR SliceGroupMap[810];
389 -+} DXVA_PicParams_H264;
390 -+
391 -+typedef struct {
392 -+ UCHAR bScalingLists4x4[6][16];
393 -+ UCHAR bScalingLists8x8[2][64];
394 -+} DXVA_Qmatrix_H264;
395 -+
396 -+
397 -+typedef struct {
398 -+ UINT BSNALunitDataLocation;
399 -+ UINT SliceBytesInBuffer;
400 -+ USHORT wBadSliceChopping;
401 -+ USHORT first_mb_in_slice;
402 -+ USHORT NumMbsForSlice;
403 -+ USHORT BitOffsetToSliceData;
404 -+ UCHAR slice_type;
405 -+ UCHAR luma_log2_weight_denom;
406 -+ UCHAR chroma_log2_weight_denom;
407 -+
408 -+ UCHAR num_ref_idx_l0_active_minus1;
409 -+ UCHAR num_ref_idx_l1_active_minus1;
410 -+ CHAR slice_alpha_c0_offset_div2;
411 -+ CHAR slice_beta_offset_div2;
412 -+ UCHAR Reserved8Bits;
413 -+ DXVA_PicEntry_H264 RefPicList[2][32];
414 -+ SHORT Weights[2][32][3][2];
415 -+ CHAR slice_qs_delta;
416 -+ CHAR slice_qp_delta;
417 -+ UCHAR redundant_pic_cnt;
418 -+ UCHAR direct_spatial_mv_pred_flag;
419 -+ UCHAR cabac_init_idc;
420 -+ UCHAR disable_deblocking_filter_idc;
421 -+ USHORT slice_id;
422 -+} DXVA_Slice_H264_Long;
423 -+
424 -+typedef struct {
425 -+ UINT BSNALunitDataLocation;
426 -+ UINT SliceBytesInBuffer;
427 -+ USHORT wBadSliceChopping;
428 -+} DXVA_Slice_H264_Short;
429 -+
430 -+typedef struct {
431 -+ USHORT wFrameWidthInMbsMinus1;
432 -+ USHORT wFrameHeightInMbsMinus1;
433 -+ DXVA_PicEntry_H264 InPic;
434 -+ DXVA_PicEntry_H264 OutPic;
435 -+ USHORT PicOrderCnt_offset;
436 -+ INT CurrPicOrderCnt;
437 -+ UINT StatusReportFeedbackNumber;
438 -+ UCHAR model_id;
439 -+ UCHAR separate_colour_description_present_flag;
440 -+ UCHAR film_grain_bit_depth_luma_minus8;
441 -+ UCHAR film_grain_bit_depth_chroma_minus8;
442 -+ UCHAR film_grain_full_range_flag;
443 -+ UCHAR film_grain_colour_primaries;
444 -+ UCHAR film_grain_transfer_characteristics;
445 -+ UCHAR film_grain_matrix_coefficients;
446 -+ UCHAR blending_mode_id;
447 -+ UCHAR log2_scale_factor;
448 -+ UCHAR comp_model_present_flag[4];
449 -+ UCHAR num_intensity_intervals_minus1[4];
450 -+ UCHAR num_model_values_minus1[4];
451 -+ UCHAR intensity_interval_lower_bound[3][16];
452 -+ UCHAR intensity_interval_upper_bound[3][16];
453 -+ SHORT comp_model_value[3][16][8];
454 -+} DXVA_FilmGrainChar_H264;
455 -+
456 -+#pragma pack(pop)
457 -+
458 -+/*************INTERFACES************/
459 -+#ifdef __cplusplus
460 -+extern "C" {
461 -+#endif
462 -+
463 -+typedef _COM_interface IDirectXVideoDecoderService IDirectXVideoDecoderService;
464 -+typedef _COM_interface IDirectXVideoDecoder IDirectXVideoDecoder;
465 -+
466 -+#undef INTERFACE
467 -+#define INTERFACE IDirectXVideoDecoder
468 -+DECLARE_INTERFACE_(IDirectXVideoDecoder,IUnknown)
469 -+{
470 -+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
471 -+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
472 -+ STDMETHOD_(ULONG,Release)(THIS) PURE;
473 -+ STDMETHOD(GetVideoDecoderService)(THIS_ IDirectXVideoDecoderService**) PURE;
474 -+ STDMETHOD(GetCreationParameters)(THIS_ GUID*,DXVA2_VideoDesc*,DXVA2_ConfigPictureDecode*,IDirect3DSurface9***,UINT*) PURE;
475 -+ STDMETHOD(GetBuffer)(THIS_ UINT,void**,UINT*) PURE;
476 -+ STDMETHOD(ReleaseBuffer)(THIS_ UINT) PURE;
477 -+ STDMETHOD(BeginFrame)(THIS_ IDirect3DSurface9 *,void*) PURE;
478 -+ STDMETHOD(EndFrame)(THIS_ HANDLE *) PURE;
479 -+ STDMETHOD(Execute)(THIS_ const DXVA2_DecodeExecuteParams*) PURE;
480 -+
481 -+
482 -+};
483 -+
484 -+#if !defined(__cplusplus) || defined(CINTERFACE)
485 -+#define IDirectXVideoDecoder_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
486 -+#define IDirectXVideoDecoder_AddRef(p) (p)->lpVtbl->AddRef(p)
487 -+#define IDirectXVideoDecoder_Release(p) (p)->lpVtbl->Release(p)
488 -+#define IDirectXVideoDecoder_BeginFrame(p,a,b) (p)->lpVtbl->BeginFrame(p,a,b)
489 -+#define IDirectXVideoDecoder_EndFrame(p,a) (p)->lpVtbl->EndFrame(p,a)
490 -+#define IDirectXVideoDecoder_Execute(p,a) (p)->lpVtbl->Execute(p,a)
491 -+#define IDirectXVideoDecoder_GetBuffer(p,a,b,c) (p)->lpVtbl->GetBuffer(p,a,b,c)
492 -+#define IDirectXVideoDecoder_GetCreationParameters(p,a,b,c,d,e) (p)->lpVtbl->GetCreationParameters(p,a,b,c,d,e)
493 -+#define IDirectXVideoDecoder_GetVideoDecoderService(p,a) (p)->lpVtbl->GetVideoDecoderService(p,a)
494 -+#define IDirectXVideoDecoder_ReleaseBuffer(p,a) (p)->lpVtbl->ReleaseBuffer(p,a)
495 -+#else
496 -+#define IDirectXVideoDecoder_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
497 -+#define IDirectXVideoDecoder_AddRef(p) (p)->AddRef()
498 -+#define IDirectXVideoDecoder_Release(p) (p)->Release()
499 -+#define IDirectXVideoDecoder_BeginFrame(p,a,b) (p)->BeginFrame(a,b)
500 -+#define IDirectXVideoDecoder_EndFrame(p,a) (p)->EndFrame(a)
501 -+#define IDirectXVideoDecoder_Execute(p,a) (p)->Execute(a)
502 -+#define IDirectXVideoDecoder_GetBuffer(p,a,b,c) (p)->GetBuffer(a,b,c)
503 -+#define IDirectXVideoDecoder_GetCreationParameters(p,a,b,c,d,e) (p)->GetCreationParameters(a,b,c,d,e)
504 -+#define IDirectXVideoDecoder_GetVideoDecoderService(p,a) (p)->GetVideoDecoderService(a)
505 -+#define IDirectXVideoDecoder_ReleaseBuffer(p,a) (p)->ReleaseBuffer(a)
506 -+#endif
507 -+
508 -+#undef INTERFACE
509 -+#define INTERFACE IDirectXVideoAccelerationService
510 -+DECLARE_INTERFACE_(IDirectXVideoAccelerationService,IUnknown)
511 -+{
512 -+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
513 -+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
514 -+ STDMETHOD_(ULONG,Release)(THIS) PURE;
515 -+ STDMETHOD(CreateSurface)(THIS_ UINT,UINT,UINT,D3DFORMAT,D3DPOOL,DWORD,DWORD,IDirect3DSurface9**,HANDLE*) PURE;
516 -+
517 -+};
518 -+
519 -+#if !defined(__cplusplus) || defined(CINTERFACE)
520 -+#define IDirectXVideoAccelerationService_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
521 -+#define IDirectXVideoAccelerationService_AddRef(p) (p)->lpVtbl->AddRef(p)
522 -+#define IDirectXVideoAccelerationService_Release(p) (p)->lpVtbl->Release(p)
523 -+#define IDirectXVideoAccelerationService_CreateSurface(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CreateSurface(p,a,b,c,d,e,f,g,h,i)
524 -+#else
525 -+#define IDirectXVideoAccelerationService_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
526 -+#define IDirectXVideoAccelerationService_AddRef(p) (p)->AddRef()
527 -+#define IDirectXVideoAccelerationService_Release(p) (p)->Release()
528 -+#define IDirectXVideoAccelerationService_CreateSurface(p,a,b,c,d,e,f,g,h,i) (p)->CreateSurface(a,b,c,d,e,f,g,h,i)
529 -+#endif
530 -+
531 -+#undef INTERFACE
532 -+#define INTERFACE IDirectXVideoDecoderService
533 -+DECLARE_INTERFACE_(IDirectXVideoDecoderService,IDirectXVideoAccelerationService)
534 -+{
535 -+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
536 -+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
537 -+ STDMETHOD_(ULONG,Release)(THIS) PURE;
538 -+ STDMETHOD(CreateSurface)(THIS_ UINT,UINT,UINT,D3DFORMAT,D3DPOOL,DWORD,DWORD,IDirect3DSurface9**,HANDLE*) PURE;
539 -+ STDMETHOD(GetDecoderDeviceGuids)(THIS_ UINT*,GUID **) PURE;
540 -+ STDMETHOD(GetDecoderRenderTargets)(THIS_ REFGUID,UINT*,D3DFORMAT**) PURE;
541 -+ STDMETHOD(GetDecoderConfigurations)(THIS_ REFGUID,const DXVA2_VideoDesc*,IUnknown*,UINT*,DXVA2_ConfigPictureDecode**) PURE;
542 -+ STDMETHOD(CreateVideoDecoder)(THIS_ REFGUID,const DXVA2_VideoDesc*,DXVA2_ConfigPictureDecode*,IDirect3DSurface9**,UINT,IDirectXVideoDecoder**) PURE;
543 -+};
544 -+
545 -+#if !defined(__cplusplus) || defined(CINTERFACE)
546 -+#define IDirectXVideoDecoderService_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
547 -+#define IDirectXVideoDecoderService_AddRef(p) (p)->lpVtbl->AddRef(p)
548 -+#define IDirectXVideoDecoderService_Release(p) (p)->lpVtbl->Release(p)
549 -+#define IDirectXVideoDecoderService_CreateSurface(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CreateSurface(p,a,b,c,d,e,f,g,h,i)
550 -+#define IDirectXVideoDecoderService_CreateVideoDecoder(p,a,b,c,d,e,f) (p)->lpVtbl->CreateVideoDecoder(p,a,b,c,d,e,f)
551 -+#define IDirectXVideoDecoderService_GetDecoderConfigurations(p,a,b,c,d,e) (p)->lpVtbl->GetDecoderConfigurations(p,a,b,c,d,e)
552 -+#define IDirectXVideoDecoderService_GetDecoderDeviceGuids(p,a,b) (p)->lpVtbl->GetDecoderDeviceGuids(p,a,b)
553 -+#define IDirectXVideoDecoderService_GetDecoderRenderTargets(p,a,b,c) (p)->lpVtbl->GetDecoderRenderTargets(p,a,b,c)
554 -+#else
555 -+#define IDirectXVideoDecoderService_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
556 -+#define IDirectXVideoDecoderService_AddRef(p) (p)->AddRef()
557 -+#define IDirectXVideoDecoderService_Release(p) (p)->Release()
558 -+#define IDirectXVideoDecoderService_CreateSurface(p,a,b,c,d,e,f,g,h,i) (p)->CreateSurface(a,b,c,d,e,f,g,h,i)
559 -+#define IDirectXVideoDecoderService_CreateVideoDecoder(p,a,b,c,d,e,f) (p)->CreateVideoDecoder(a,b,c,d,e,f)
560 -+#define IDirectXVideoDecoderService_GetDecoderConfigurations(p,a,b,c,d,e) (p)->GetDecoderConfigurations(a,b,c,d,e)
561 -+#define IDirectXVideoDecoderService_GetDecoderDeviceGuids(p,a,b) (p)->GetDecoderDeviceGuids(a,b)
562 -+#define IDirectXVideoDecoderService_GetDecoderRenderTargets(p,a,b,c) (p)->GetDecoderRenderTargets(a,b,c)
563 -+#endif
564 -+
565 -+#undef INTERFACE
566 -+#define INTERFACE IDirect3DDeviceManager9
567 -+DECLARE_INTERFACE_(IDirect3DDeviceManager9,IUnknown)
568 -+{
569 -+ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
570 -+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
571 -+ STDMETHOD_(ULONG,Release)(THIS) PURE;
572 -+ STDMETHOD(ResetDevice)(THIS_ IDirect3DDevice9*,UINT) PURE;
573 -+ STDMETHOD(OpenDeviceHandle)(THIS_ HANDLE*) PURE;
574 -+ STDMETHOD(CloseDeviceHandle)( THIS_ HANDLE) PURE;
575 -+ STDMETHOD(TestDevice)( THIS_ HANDLE) PURE;
576 -+ STDMETHOD(LockDevice)( THIS_ HANDLE,IDirect3DDevice9**,BOOL) PURE;
577 -+ STDMETHOD(UnlockDevice)( THIS_ HANDLE,BOOL) PURE;
578 -+ STDMETHOD(GetVideoService)( THIS_ HANDLE,REFIID,void**) PURE;
579 -+};
580 -+
581 -+#if !defined(__cplusplus) || defined(CINTERFACE)
582 -+#define IDirect3DDeviceManager9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
583 -+#define IDirect3DDeviceManager9_AddRef(p) (p)->lpVtbl->AddRef(p)
584 -+#define IDirect3DDeviceManager9_Release(p) (p)->lpVtbl->Release(p)
585 -+#define IDirect3DDeviceManager9_ResetDevice(p,a,b) (p)->lpVtbl->ResetDevice(p,a,b)
586 -+#define IDirect3DDeviceManager9_OpenDeviceHandle(p,a) (p)->lpVtbl->OpenDeviceHandle(p,a)
587 -+#define IDirect3DDeviceManager9_CloseDeviceHandle(p,a) (p)->lpVtbl->CloseDeviceHandle(p,a)
588 -+#define IDirect3DDeviceManager9_TestDevice(p,a) (p)->lpVtbl->TestDevice(p,a)
589 -+#define IDirect3DDeviceManager9_LockDevice(p,a,b,c) (p)->lpVtbl->LockDevice(p,a,b,c)
590 -+#define IDirect3DDeviceManager9_UnlockDevice(p,a,b) (p)->lpVtbl->UnlockDevice(p,a,b)
591 -+#define IDirect3DDeviceManager9_GetVideoService(p,a,b,c) (p)->lpVtbl->GetVideoService(p,a,b,c)
592 -+#else
593 -+#define IDirect3DDeviceManager9_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
594 -+#define IDirect3DDeviceManager9_AddRef(p) (p)->AddRef()
595 -+#define IDirect3DDeviceManager9_Release(p) (p)->Release()
596 -+#define IDirect3DDeviceManager9_ResetDevice(p,a,b) (p)->ResetDevice(a,b)
597 -+#define IDirect3DDeviceManager9_OpenDeviceHandle(p,a) (p)->OpenDeviceHandle(a)
598 -+#define IDirect3DDeviceManager9_CloseDeviceHandle(p,a) (p)->CloseDeviceHandle(a)
599 -+#define IDirect3DDeviceManager9_TestDevice(p,a) (p)->TestDevice(a)
600 -+#define IDirect3DDeviceManager9_LockDevice(p,a,b,c) (p)->LockDevice(a,b,c)
601 -+#define IDirect3DDeviceManager9_UnlockDevice(p,a,b) (p)->UnlockDevice(a,b)
602 -+#define IDirect3DDeviceManager9_GetVideoService(p,a,b,c) (p)->GetVideoService(a,b,c)
603 -+#endif
604 -+
605 -+#ifdef __cplusplus
606 -+};
607 -+#endif
608 -+
609 -+#endif //_DXVA2API_H
610 -diff --git a/include-xbmc-win32/libavutil/avconfig.h b/include-xbmc-win32/libavutil/avconfig.h
611 -new file mode 100644
612 -index 0000000..f10aa61
613 ---- /dev/null
614 -+++ b/include-xbmc-win32/libavutil/avconfig.h
615 -@@ -0,0 +1,6 @@
616 -+/* Generated by ffconf */
617 -+#ifndef AVUTIL_AVCONFIG_H
618 -+#define AVUTIL_AVCONFIG_H
619 -+#define AV_HAVE_BIGENDIAN 0
620 -+#define AV_HAVE_FAST_UNALIGNED 1
621 -+#endif /* AVUTIL_AVCONFIG_H */
622 ---
623 -1.7.3
624 -
625 --
626 1.7.10
627
  ViewVC Help
Powered by ViewVC 1.1.30