Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
77d2cb88
Commit
77d2cb88
authored
Mar 25, 2017
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avdevice/decklink: deprecate @mode syntax in device name to specify mode
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
c395d230
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
decklink_common.cpp
libavdevice/decklink_common.cpp
+3
-4
decklink_dec.cpp
libavdevice/decklink_dec.cpp
+1
-0
No files found.
libavdevice/decklink_common.cpp
View file @
77d2cb88
...
...
@@ -286,7 +286,6 @@ int ff_decklink_list_formats(AVFormatContext *avctx, decklink_direction_t direct
IDeckLinkDisplayModeIterator
*
itermode
;
IDeckLinkDisplayMode
*
mode
;
uint32_t
format_code
;
int
i
=
0
;
HRESULT
res
;
if
(
direction
==
DIRECTION_IN
)
{
...
...
@@ -307,14 +306,14 @@ int ff_decklink_list_formats(AVFormatContext *avctx, decklink_direction_t direct
return
AVERROR
(
EIO
);
}
av_log
(
avctx
,
AV_LOG_INFO
,
"Supported formats for '%s':
\n\t
mode
\t
format_code
\t
description"
,
av_log
(
avctx
,
AV_LOG_INFO
,
"Supported formats for '%s':
\n\t
format_code
\t
description"
,
avctx
->
filename
);
while
(
itermode
->
Next
(
&
mode
)
==
S_OK
)
{
BMDTimeValue
tb_num
,
tb_den
;
mode
->
GetFrameRate
(
&
tb_num
,
&
tb_den
);
format_code
=
av_bswap32
(
mode
->
GetDisplayMode
());
av_log
(
avctx
,
AV_LOG_INFO
,
"
\n\t
%
d
\t
%
.4s
\t\t
%ldx%ld at %d/%d fps"
,
++
i
,
(
char
*
)
&
format_code
,
mode
->
GetWidth
(),
mode
->
GetHeight
(),
av_log
(
avctx
,
AV_LOG_INFO
,
"
\n\t
%.4s
\t\t
%ldx%ld at %d/%d fps"
,
(
char
*
)
&
format_code
,
mode
->
GetWidth
(),
mode
->
GetHeight
(),
(
int
)
tb_den
,
(
int
)
tb_num
);
switch
(
mode
->
GetFieldDominance
())
{
case
bmdLowerFieldFirst
:
...
...
libavdevice/decklink_dec.cpp
View file @
77d2cb88
...
...
@@ -516,6 +516,7 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx)
strcpy
(
fname
,
avctx
->
filename
);
tmp
=
strchr
(
fname
,
'@'
);
if
(
tmp
!=
NULL
)
{
av_log
(
avctx
,
AV_LOG_WARNING
,
"The @mode syntax is deprecated and will be removed. Please use the -format_code option.
\n
"
);
mode_num
=
atoi
(
tmp
+
1
);
*
tmp
=
0
;
}
...
...
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