summaryrefslogtreecommitdiff
path: root/libavdevice/decklink_common.h
diff options
context:
space:
mode:
authorChris Spencer <spencercw@gmail.com>2015-07-19 20:32:49 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-28 05:16:05 +0200
commit9c41126e1b9f8c625cba20164ab7d48c075f6923 (patch)
tree0346d8ebd1e24974f5b6e8c20608050725b9ccfc /libavdevice/decklink_common.h
parentcdb0225fa9e65b61a3a4b5f7975dd467d7e622ab (diff)
downloadffmpeg-9c41126e1b9f8c625cba20164ab7d48c075f6923.tar.gz
avdevice/decklink: Fix build error caused by a change in the SDK.
In version 10.4 of the DeckLink SDK, GetBufferedAudioSampleFrameCount() was changed to take an unsigned int instead of an unsigned long. Signed-off-by: Chris Spencer <spencercw@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavdevice/decklink_common.h')
-rw-r--r--libavdevice/decklink_common.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h
index 96912a7c2d..3bc30f062c 100644
--- a/libavdevice/decklink_common.h
+++ b/libavdevice/decklink_common.h
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <DeckLinkAPIVersion.h>
+
#include "decklink_common_c.h"
class decklink_output_callback;
@@ -82,7 +84,11 @@ struct decklink_ctx {
typedef enum { DIRECTION_IN, DIRECTION_OUT} decklink_direction_t;
#ifdef _WIN32
+#if BLACKMAGIC_DECKLINK_API_VERSION < 0x0a040000
typedef unsigned long buffercount_type;
+#else
+typedef unsigned int buffercount_type;
+#endif
IDeckLinkIterator *CreateDeckLinkIteratorInstance(void);
#else
typedef uint32_t buffercount_type;