Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
b68dd8a1
Commit
b68dd8a1
authored
Feb 03, 2013
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/concatdec: allow probing.
parent
db9dc515
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
demuxers.texi
doc/demuxers.texi
+4
-2
concatdec.c
libavformat/concatdec.c
+2
-1
No files found.
doc/demuxers.texi
View file @
b68dd8a1
...
@@ -44,8 +44,6 @@ length.
...
@@ -44,8 +44,6 @@ length.
All files must have the same streams (same codecs, same time base, etc.).
All files must have the same streams (same codecs, same time base, etc.).
This script format can currently not be probed, it must be specified explicitly.
@subsection Syntax
@subsection Syntax
The script is a text file in extended-ASCII, with one directive per line.
The script is a text file in extended-ASCII, with one directive per line.
...
@@ -62,6 +60,10 @@ backslash or single quotes.
...
@@ -62,6 +60,10 @@ backslash or single quotes.
Identify the script type and version. It also sets the @option{safe} option
Identify the script type and version. It also sets the @option{safe} option
to 1 if it was to its default -1.
to 1 if it was to its default -1.
To make FFmpeg recognize the format automatically, this directive must
appears exactly as is (no extra space or byte-order-mark) on the very first
line of the script.
@end table
@end table
@subsection Options
@subsection Options
...
...
libavformat/concatdec.c
View file @
b68dd8a1
...
@@ -40,7 +40,8 @@ typedef struct {
...
@@ -40,7 +40,8 @@ typedef struct {
static
int
concat_probe
(
AVProbeData
*
probe
)
static
int
concat_probe
(
AVProbeData
*
probe
)
{
{
return
0
;
return
memcmp
(
probe
->
buf
,
"ffconcat version 1.0"
,
20
)
?
0
:
AVPROBE_SCORE_MAX
;
}
}
static
char
*
get_keyword
(
uint8_t
**
cursor
)
static
char
*
get_keyword
(
uint8_t
**
cursor
)
...
...
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