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
b3b7ba62
Commit
b3b7ba62
authored
May 07, 2019
by
Gyan Doshi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/vf_xstack: set better error msg for
missing layout
parent
e25bddf5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
1 deletion
+10
-1
vf_stack.c
libavfilter/vf_stack.c
+10
-1
No files found.
libavfilter/vf_stack.c
View file @
b3b7ba62
...
...
@@ -83,6 +83,15 @@ static av_cold int init(AVFilterContext *ctx)
return
AVERROR
(
ENOMEM
);
if
(
!
strcmp
(
ctx
->
filter
->
name
,
"xstack"
))
{
if
(
!
s
->
layout
)
{
if
(
s
->
nb_inputs
==
2
)
s
->
layout
=
"0_0|w0_0"
;
else
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"No layout specified.
\n
"
);
return
AVERROR
(
EINVAL
);
}
}
s
->
items
=
av_calloc
(
s
->
nb_inputs
,
sizeof
(
*
s
->
items
));
if
(
!
s
->
items
)
return
AVERROR
(
ENOMEM
);
...
...
@@ -385,7 +394,7 @@ AVFilter ff_vf_vstack = {
static
const
AVOption
xstack_options
[]
=
{
{
"inputs"
,
"set number of inputs"
,
OFFSET
(
nb_inputs
),
AV_OPT_TYPE_INT
,
{.
i64
=
2
},
2
,
INT_MAX
,
.
flags
=
FLAGS
},
{
"layout"
,
"set custom layout"
,
OFFSET
(
layout
),
AV_OPT_TYPE_STRING
,
{.
str
=
"0_0|w0_0"
},
0
,
0
,
.
flags
=
FLAGS
},
{
"layout"
,
"set custom layout"
,
OFFSET
(
layout
),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
0
,
0
,
.
flags
=
FLAGS
},
{
"shortest"
,
"force termination when the shortest input terminates"
,
OFFSET
(
shortest
),
AV_OPT_TYPE_BOOL
,
{.
i64
=
0
},
0
,
1
,
.
flags
=
FLAGS
},
{
NULL
},
};
...
...
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