From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Tue, 22 Mar 2011 13:41:04 +0000 (+0000)
Subject: Update blackmagic headers to latest version
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=998832b034c387fbed89f5b2fa136a76059a3038;p=kdenlive

Update blackmagic headers to latest version

svn path=/trunk/kdenlive/; revision=5512
---

diff --git a/src/blackmagic/include/DeckLinkAPI.h b/src/blackmagic/include/DeckLinkAPI.h
index 26267d82..19eb07e9 100644
--- a/src/blackmagic/include/DeckLinkAPI.h
+++ b/src/blackmagic/include/DeckLinkAPI.h
@@ -83,6 +83,8 @@ enum _BMDDisplayMode {
     bmdModeNTSC                                        = /* 'ntsc' */ 0x6E747363,
     bmdModeNTSC2398                                    = /* 'nt23' */ 0x6E743233,	// 3:2 pulldown
     bmdModePAL                                         = /* 'pal ' */ 0x70616C20,
+    bmdModeNTSCp                                       = /* 'ntsp' */ 0x6E747370,
+    bmdModePALp                                        = /* 'palp' */ 0x70616C70,
 
     /* HD 1080 Modes */
 
@@ -359,6 +361,7 @@ enum _BMDVideo3DPackingFormat {
     bmdVideo3DPackingSidebySideHalf                    = /* 'sbsh' */ 0x73627368,
     bmdVideo3DPackingLinebyLine                        = /* 'lbyl' */ 0x6C62796C,
     bmdVideo3DPackingTopAndBottom                      = /* 'tabo' */ 0x7461626F,
+    bmdVideo3DPackingFramePacking                      = /* 'frpk' */ 0x6672706B,
     bmdVideo3DPackingLeftOnly                          = /* 'left' */ 0x6C656674,
     bmdVideo3DPackingRightOnly                         = /* 'righ' */ 0x72696768
 };
@@ -877,7 +880,7 @@ class IDeckLinkVideoFrame3DExtensions : public IUnknown
 {
 public:
     virtual BMDVideo3DPackingFormat Get3DPackingFormat (void) = 0;
-    virtual HRESULT GetFrameForRightEye (/* in */ IDeckLinkVideoFrame* *rightEyeFrame) = 0;
+    virtual HRESULT GetFrameForRightEye (/* out */ IDeckLinkVideoFrame* *rightEyeFrame) = 0;
 
 protected:
     virtual ~IDeckLinkVideoFrame3DExtensions () {}; // call Release method to drop reference count
diff --git a/src/blackmagic/include/DeckLinkAPIVersion.h b/src/blackmagic/include/DeckLinkAPIVersion.h
index 4795c8d8..9a7e0a9f 100644
--- a/src/blackmagic/include/DeckLinkAPIVersion.h
+++ b/src/blackmagic/include/DeckLinkAPIVersion.h
@@ -1,5 +1,5 @@
 /* -LICENSE-START-
- * ** Copyright (c) 2010 Blackmagic Design
+ * ** Copyright (c) 2011 Blackmagic Design
  * **
  * ** Permission is hereby granted, free of charge, to any person or organization
  * ** obtaining a copy of the software and accompanying documentation covered by
@@ -30,8 +30,8 @@
 #ifndef __DeckLink_API_Verison_h__
 #define __DeckLink_API_Version_h__
 
-#define BLACKMAGIC_DECKLINK_API_VERSION					0x07090000
-#define BLACKMAGIC_DECKLINK_API_VERSION_STRING			"7.9"
+#define BLACKMAGIC_DECKLINK_API_VERSION					0x07090500
+#define BLACKMAGIC_DECKLINK_API_VERSION_STRING			"7.9.5"
 
 #endif	// __DeckLink_API_Version_h__
 
diff --git a/src/blackmagic/include/LinuxCOM.h b/src/blackmagic/include/LinuxCOM.h
index 68de2676..2b13697d 100644
--- a/src/blackmagic/include/LinuxCOM.h
+++ b/src/blackmagic/include/LinuxCOM.h
@@ -89,7 +89,6 @@ typedef void *LPVOID;
 class IUnknown
 {
     public:
-        //virtual ~IUnknown() {};
     	virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, LPVOID *ppv) = 0;
     	virtual ULONG STDMETHODCALLTYPE AddRef(void) = 0;
     	virtual ULONG STDMETHODCALLTYPE Release(void) = 0;