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
db9dc515
Commit
db9dc515
authored
Feb 03, 2013
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/concatdec: add signature directive.
parent
6d680d20
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
0 deletions
+13
-0
demuxers.texi
doc/demuxers.texi
+4
-0
concatdec.c
libavformat/concatdec.c
+9
-0
No files found.
doc/demuxers.texi
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
...
...
libavformat/concatdec.c
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
);
...
...
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