Skip to content
Snippets Groups Projects
Commit b68dd8a1 authored by Nicolas George's avatar Nicolas George
Browse files

lavf/concatdec: allow probing.

parent db9dc515
No related branches found
No related tags found
No related merge requests found
...@@ -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
......
...@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment