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
b68dd8a1
Commit
b68dd8a1
authored
12 years ago
by
Nicolas George
Browse files
Options
Downloads
Patches
Plain Diff
lavf/concatdec: allow probing.
parent
db9dc515
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
-2
4 additions, 2 deletions
doc/demuxers.texi
libavformat/concatdec.c
+2
-1
2 additions, 1 deletion
libavformat/concatdec.c
with
6 additions
and
3 deletions
doc/demuxers.texi
+
4
−
2
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
...
...
This diff is collapsed.
Click to expand it.
libavformat/concatdec.c
+
2
−
1
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
)
...
...
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