ffmpeg | branch: master | Chris Spencer <spence...@gmail.com> | Sun Jul 19 20:32:49 2015 +0100| [9c41126e1b9f8c625cba20164ab7d48c075f6923] | committer: Michael Niedermayer
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 <spence...@gmail.com> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c41126e1b9f8c625cba20164ab7d48c075f6923 --- libavdevice/decklink_common.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h index 96912a7..3bc30f0 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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog