[vlc-commits] dxva2: don't define unused values

[Rafaël Carré]

vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Mon Feb  6 01:04:48 2012 -0500| [d8f60bdb66f0ee8b164b80d57d24afc7fde69c93] | committer: Rafaël Carré

dxva2: don't define unused values

define DXVA2_E_NEW_VIDEO_DEVICE only if not defined already
(cherry picked from commit 454ef7c42ffc7ad1626fa9d2acba7064ec76b466)

Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=d8f60bdb66f0ee8b164b80d57d24afc7fde69c93
---

 modules/codec/avcodec/dxva2.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index 82c5263..de9d200 100644
--- 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}