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
b0e2f4a7
Commit
b0e2f4a7
authored
Oct 25, 2012
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/concat: implement unsafe mode.
parent
c4a36b6f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
filters.texi
doc/filters.texi
+3
-0
avf_concat.c
libavfilter/avf_concat.c
+6
-1
No files found.
doc/filters.texi
View file @
b0e2f4a7
...
...
@@ -4643,6 +4643,9 @@ streams in each segment. Default is 1.
Set the number of output audio streams, that is also the number of video
streams in each segment. Default is 0.
@item unsafe
Activate unsafe mode: do not fail if segments have a different format.
@end table
The filter has @var{v}+@var{a} outputs: first @var{v} video outputs, then
...
...
libavfilter/avf_concat.c
View file @
b0e2f4a7
...
...
@@ -42,6 +42,7 @@ typedef struct {
unsigned
cur_idx
;
/**< index of the first input of current segment */
int64_t
delta_ts
;
/**< timestamp to add to produce output timestamps */
unsigned
nb_in_active
;
/**< number of active inputs in current segment */
unsigned
unsafe
;
struct
concat_in
{
int64_t
pts
;
int64_t
nb_frames
;
...
...
@@ -64,6 +65,9 @@ static const AVOption concat_options[] = {
{
"a"
,
"specify the number of audio streams"
,
OFFSET
(
nb_streams
[
AVMEDIA_TYPE_AUDIO
]),
AV_OPT_TYPE_INT
,
{
.
i64
=
0
},
0
,
INT_MAX
,
A
|
F
},
{
"unsafe"
,
"enable unsafe mode"
,
OFFSET
(
unsafe
),
AV_OPT_TYPE_INT
,
{
.
i64
=
0
},
0
,
INT_MAX
,
A
|
A
|
F
},
{
0
}
};
...
...
@@ -143,6 +147,7 @@ static int config_output(AVFilterLink *outlink)
ctx
->
input_pads
[
out_no
].
name
,
outlink
->
w
,
outlink
->
h
,
outlink
->
sample_aspect_ratio
.
num
,
outlink
->
sample_aspect_ratio
.
den
);
if
(
!
cat
->
unsafe
)
return
AVERROR
(
EINVAL
);
}
}
...
...
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