dxva2: don't define unused values

define DXVA2_E_NEW_VIDEO_DEVICE only if not defined already

dxva2: don't define unused values
define DXVA2_E_NEW_VIDEO_DEVICE only if not defined already
454ef7c4 · Rafaël Carré · a9060f35 · 454ef7c4
Commit 454ef7c4 authored Feb 06, 2012 by Rafaël Carré
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

modules/codec/avcodec/dxva2.c modules/codec/avcodec/dxva2.c +3 -4

No files found.
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -75,10 +75,9 @@
 #endif

 /* */
-#define DXVA2_E_NOT_INITIALIZED     MAKE_HRESULT(1, 4, 4096)
-#define DXVA2_E_NEW_VIDEO_DEVICE    MAKE_HRESULT(1, 4, 4097)
-#define DXVA2_E_VIDEO_DEVICE_LOCKED MAKE_HRESULT(1, 4, 4098)
-#define DXVA2_E_NOT_AVAILABLE       MAKE_HRESULT(1, 4, 4099)
+#ifndef DXVA2_E_NEW_VIDEO_DEVICE
+# define DXVA2_E_NEW_VIDEO_DEVICE MAKE_HRESULT(1, 4, 4097)
+#endif

 static const GUID DXVA2_ModeMPEG2_MoComp = {
    0xe6a9f44b, 0x61b0,0x4563, {0x9e,0xa4,0x63,0xd2,0xa3,0xc6,0xfe,0x66}