Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
ffmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Samuel Mira
ffmpeg
Commits
b0e2f4a7
Commit
b0e2f4a7
authored
12 years ago
by
Nicolas George
Browse files
Options
Downloads
Patches
Plain Diff
lavfi/concat: implement unsafe mode.
parent
c4a36b6f
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/filters.texi
+3
-0
3 additions, 0 deletions
doc/filters.texi
libavfilter/avf_concat.c
+6
-1
6 additions, 1 deletion
libavfilter/avf_concat.c
with
9 additions
and
1 deletion
doc/filters.texi
+
3
−
0
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
...
...
This diff is collapsed.
Click to expand it.
libavfilter/avf_concat.c
+
6
−
1
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,7 +147,8 @@ 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
);
return
AVERROR
(
EINVAL
);
if
(
!
cat
->
unsafe
)
return
AVERROR
(
EINVAL
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment