Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
b18d6c58
Commit
b18d6c58
authored
Jun 26, 2016
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avdevice/decklink: fix mingw portability
Fixes ticket #5669. Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
729d82ab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
decklink_common.cpp
libavdevice/decklink_common.cpp
+5
-2
decklink_common.h
libavdevice/decklink_common.h
+2
-2
No files found.
libavdevice/decklink_common.cpp
View file @
b18d6c58
...
...
@@ -70,6 +70,7 @@ static char *dup_wchar_to_utf8(wchar_t *w)
#define DECKLINK_STR OLECHAR *
#define DECKLINK_STRDUP dup_wchar_to_utf8
#define DECKLINK_FREE(s) SysFreeString(s)
#define DECKLINK_BOOL BOOL
#elif defined(__APPLE__)
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_STRDUP dup_cfstring_to_utf8
#define DECKLINK_FREE(s) free((void *) s)
#define DECKLINK_BOOL bool
#else
#define DECKLINK_STR const char *
#define DECKLINK_STRDUP av_strdup
/* free() is needed for a string returned by the DeckLink SDL. */
#define DECKLINK_FREE(s) free((void *) s)
#define DECKLINK_BOOL bool
#endif
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_ctx
*
ctx
=
(
struct
decklink_ctx
*
)
cctx
->
ctx
;
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"
;
int64_t
supported_connections
=
0
;
HRESULT
res
;
...
...
@@ -141,7 +144,7 @@ int ff_decklink_set_format(AVFormatContext *avctx,
HRESULT
res
;
if
(
ctx
->
duplex_mode
)
{
bool
duplex_supported
=
false
;
DECKLINK_BOOL
duplex_supported
=
false
;
if
(
ctx
->
attr
->
GetFlag
(
BMDDeckLinkSupportsDuplexModeConfiguration
,
&
duplex_supported
)
!=
S_OK
)
duplex_supported
=
false
;
...
...
libavdevice/decklink_common.h
View file @
b18d6c58
...
...
@@ -107,7 +107,7 @@ typedef uint32_t buffercount_type;
#endif
static
const
BMDAudioConnection
decklink_audio_connection_map
[]
=
{
0
,
(
BMDAudioConnection
)
0
,
bmdAudioConnectionEmbedded
,
bmdAudioConnectionAESEBU
,
bmdAudioConnectionAnalog
,
...
...
@@ -117,7 +117,7 @@ static const BMDAudioConnection decklink_audio_connection_map[] = {
};
static
const
BMDVideoConnection
decklink_video_connection_map
[]
=
{
0
,
(
BMDVideoConnection
)
0
,
bmdVideoConnectionSDI
,
bmdVideoConnectionHDMI
,
bmdVideoConnectionOpticalSDI
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment