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
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
libremedia
Tethys
FFmpeg
Commits
db9dc515
Commit
db9dc515
authored
12 years ago
by
Nicolas George
Browse files
Options
Downloads
Patches
Plain Diff
lavf/concatdec: add signature directive.
parent
6d680d20
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/demuxers.texi
+4
-0
4 additions, 0 deletions
doc/demuxers.texi
libavformat/concatdec.c
+9
-0
9 additions, 0 deletions
libavformat/concatdec.c
with
13 additions
and
0 deletions
doc/demuxers.texi
+
4
−
0
View file @
db9dc515
...
@@ -58,6 +58,10 @@ following directive is recognized:
...
@@ -58,6 +58,10 @@ following directive is recognized:
Path to a file to read; special characters and spaces must be escaped with
Path to a file to read; special characters and spaces must be escaped with
backslash or single quotes.
backslash or single quotes.
@item @code{ffconcat version 1.0}
Identify the script type and version. It also sets the @option{safe} option
to 1 if it was to its default -1.
@end table
@end table
@subsection Options
@subsection Options
...
...
This diff is collapsed.
Click to expand it.
libavformat/concatdec.c
+
9
−
0
View file @
db9dc515
...
@@ -173,6 +173,15 @@ static int concat_read_header(AVFormatContext *avf)
...
@@ -173,6 +173,15 @@ static int concat_read_header(AVFormatContext *avf)
}
}
if
((
ret
=
add_file
(
avf
,
filename
,
&
file
,
&
nb_files_alloc
))
<
0
)
if
((
ret
=
add_file
(
avf
,
filename
,
&
file
,
&
nb_files_alloc
))
<
0
)
FAIL
(
ret
);
FAIL
(
ret
);
}
else
if
(
!
strcmp
(
keyword
,
"ffconcat"
))
{
char
*
ver_kw
=
get_keyword
(
&
cursor
);
char
*
ver_val
=
get_keyword
(
&
cursor
);
if
(
strcmp
(
ver_kw
,
"version"
)
||
strcmp
(
ver_val
,
"1.0"
))
{
av_log
(
avf
,
AV_LOG_ERROR
,
"Line %d: invalid version
\n
"
,
line
);
FAIL
(
AVERROR_INVALIDDATA
);
}
if
(
cat
->
safe
<
0
)
cat
->
safe
=
1
;
}
else
{
}
else
{
av_log
(
avf
,
AV_LOG_ERROR
,
"Line %d: unknown keyword '%s'
\n
"
,
av_log
(
avf
,
AV_LOG_ERROR
,
"Line %d: unknown keyword '%s'
\n
"
,
line
,
keyword
);
line
,
keyword
);
...
...
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