virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avdevice/decklink: fix mingw portability

Browse Source 
Fixes ticket #5669.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2016-06-27 01:11:50 +02:00
parent 729d82abae
commit b18d6c5800
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavdevice/decklink_common.cpp
View File

@ -70,6 +70,7 @@ static char *dup_wchar_to_utf8(wchar_t *w)
#define DECKLINK_STR OLECHAR * #define DECKLINK_STR OLECHAR *
#define DECKLINK_STRDUP dup_wchar_to_utf8 #define DECKLINK_STRDUP dup_wchar_to_utf8
#define DECKLINK_FREE(s) SysFreeString(s) #define DECKLINK_FREE(s) SysFreeString(s)
#define DECKLINK_BOOL BOOL
#elif defined(__APPLE__) #elif defined(__APPLE__)
static char *dup_cfstring_to_utf8(CFStringRef w) static char *dup_cfstring_to_utf8(CFStringRef w)
{ {
@ -80,11 +81,13 @@ static char *dup_cfstring_to_utf8(CFStringRef w)
#define DECKLINK_STR const __CFString * #define DECKLINK_STR const __CFString *
#define DECKLINK_STRDUP dup_cfstring_to_utf8 #define DECKLINK_STRDUP dup_cfstring_to_utf8
#define DECKLINK_FREE(s) free((void *) s) #define DECKLINK_FREE(s) free((void *) s)
#define DECKLINK_BOOL bool
#else #else
#define DECKLINK_STR const char * #define DECKLINK_STR const char *
#define DECKLINK_STRDUP av_strdup #define DECKLINK_STRDUP av_strdup
/* free() is needed for a string returned by the DeckLink SDL. */ /* free() is needed for a string returned by the DeckLink SDL. */
#define DECKLINK_FREE(s) free((void *) s) #define DECKLINK_FREE(s) free((void *) s)
#define DECKLINK_BOOL bool
#endif #endif
HRESULT ff_decklink_get_display_name(IDeckLink *This, const char **displayName) HRESULT ff_decklink_get_display_name(IDeckLink *This, const char **displayName)
@ -103,7 +106,7 @@ static int decklink_select_input(AVFormatContext *avctx, BMDDeckLinkConfiguratio
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data;
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx;
BMDDeckLinkAttributeID attr_id = (cfg_id == bmdDeckLinkConfigAudioInputConnection) ? BMDDeckLinkAudioInputConnections : BMDDeckLinkVideoInputConnections; BMDDeckLinkAttributeID attr_id = (cfg_id == bmdDeckLinkConfigAudioInputConnection) ? BMDDeckLinkAudioInputConnections : BMDDeckLinkVideoInputConnections;
int64_t bmd_input = (cfg_id == bmdDeckLinkConfigAudioInputConnection) ? ctx->audio_input : ctx->video_input; int64_t bmd_input = (cfg_id == bmdDeckLinkConfigAudioInputConnection) ? (int64_t)ctx->audio_input : (int64_t)ctx->video_input;
const char *type_name = (cfg_id == bmdDeckLinkConfigAudioInputConnection) ? "audio" : "video"; const char *type_name = (cfg_id == bmdDeckLinkConfigAudioInputConnection) ? "audio" : "video";
int64_t supported_connections = 0; int64_t supported_connections = 0;
HRESULT res; HRESULT res;
@ -141,7 +144,7 @@ int ff_decklink_set_format(AVFormatContext *avctx,
HRESULT res; HRESULT res;
if (ctx->duplex_mode) { if (ctx->duplex_mode) {
bool duplex_supported = false; DECKLINK_BOOL duplex_supported = false;
if (ctx->attr->GetFlag(BMDDeckLinkSupportsDuplexModeConfiguration, &duplex_supported) != S_OK) if (ctx->attr->GetFlag(BMDDeckLinkSupportsDuplexModeConfiguration, &duplex_supported) != S_OK)
duplex_supported = false; duplex_supported = false;

4
libavdevice/decklink_common.h
View File

@ -107,7 +107,7 @@ typedef uint32_t buffercount_type;
#endif #endif
static const BMDAudioConnection decklink_audio_connection_map[] = { static const BMDAudioConnection decklink_audio_connection_map[] = {
0, (BMDAudioConnection)0,
bmdAudioConnectionEmbedded, bmdAudioConnectionEmbedded,
bmdAudioConnectionAESEBU, bmdAudioConnectionAESEBU,
bmdAudioConnectionAnalog, bmdAudioConnectionAnalog,
@ -117,7 +117,7 @@ static const BMDAudioConnection decklink_audio_connection_map[] = {
}; };
static const BMDVideoConnection decklink_video_connection_map[] = { static const BMDVideoConnection decklink_video_connection_map[] = {
0, (BMDVideoConnection)0,
bmdVideoConnectionSDI, bmdVideoConnectionSDI,
bmdVideoConnectionHDMI, bmdVideoConnectionHDMI,
bmdVideoConnectionOpticalSDI, bmdVideoConnectionOpticalSDI,