diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-02-03 10:27:11 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-02-13 14:58:50 +0100 |
| commit | b68dd8a1614b1230ab8ee9f6a4d01aa64a8d9ea3 (patch) | |
| tree | 0bcc58cf1cdc8a3862340ca1cb6deebcfa85e74b | |
| parent | db9dc5154d1a586aa95362e7ed4334df321e5a72 (diff) | |
| download | ffmpeg-b68dd8a1614b1230ab8ee9f6a4d01aa64a8d9ea3.tar.gz | |
lavf/concatdec: allow probing.
| -rw-r--r-- | doc/demuxers.texi | 6 | ||||
| -rw-r--r-- | libavformat/concatdec.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 2867538860..e4c358c698 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -44,8 +44,6 @@ length. 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 The script is a text file in extended-ASCII, with one directive per line. @@ -62,6 +60,10 @@ backslash or single quotes. Identify the script type and version. It also sets the @option{safe} option 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 @subsection Options diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index b99ec5c15c..f1fb169259 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -40,7 +40,8 @@ typedef struct { 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) |