diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-20 11:21:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-28 15:53:54 +0100 |
| commit | d64ff3a6a961c40255e412691c33d4fc7e44cad6 (patch) | |
| tree | 6e28d89ff385084dbc49c53fc82ab7f493056336 | |
| parent | c6f6829ce6e0e3dd7d5d6f084bc8437e84ec7ee5 (diff) | |
| download | ffmpeg-d64ff3a6a961c40255e412691c33d4fc7e44cad6.tar.gz | |
avformat/img2dec: do not interpret the filename by default if a IO context has been opened
With this, user applications which use custom IO and have set a IO context will not have
their already opened IO context ignored and glob/seq being interpreted
Comments and tests from maintainers of user apps are welcome!
Liked-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 7ccedc1c78c9a5140758f515d46ce23de6e6a7d2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/img2.h | 3 | ||||
| -rw-r--r-- | libavformat/img2dec.c | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libavformat/img2.h b/libavformat/img2.h index f6b9dd9220..a9678d1f6e 100644 --- a/libavformat/img2.h +++ b/libavformat/img2.h @@ -34,7 +34,8 @@ enum PatternType { PT_GLOB_SEQUENCE, PT_GLOB, PT_SEQUENCE, - PT_NONE + PT_NONE, + PT_DEFAULT }; typedef struct VideoDemuxData { diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index a532cb6a5a..d6cfe80424 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -224,6 +224,13 @@ int ff_img_read_header(AVFormatContext *s1) } if (!s->is_pipe) { + if (s->pattern_type == PT_DEFAULT) { + if (s1->pb) { + s->pattern_type = PT_NONE; + } else + s->pattern_type = PT_GLOB_SEQUENCE; + } + if (s->pattern_type == PT_GLOB_SEQUENCE) { s->use_glob = is_glob(s->path); if (s->use_glob) { @@ -550,7 +557,7 @@ const AVOption ff_img_options[] = { { "framerate", "set the video framerate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0, DEC }, { "loop", "force loop over input file sequence", OFFSET(loop), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, DEC }, - { "pattern_type", "set pattern type", OFFSET(pattern_type), AV_OPT_TYPE_INT, {.i64=PT_GLOB_SEQUENCE}, 0, INT_MAX, DEC, "pattern_type"}, + { "pattern_type", "set pattern type", OFFSET(pattern_type), AV_OPT_TYPE_INT, {.i64=PT_DEFAULT}, 0, INT_MAX, DEC, "pattern_type"}, { "glob_sequence","select glob/sequence pattern type", 0, AV_OPT_TYPE_CONST, {.i64=PT_GLOB_SEQUENCE}, INT_MIN, INT_MAX, DEC, "pattern_type" }, { "glob", "select glob pattern type", 0, AV_OPT_TYPE_CONST, {.i64=PT_GLOB }, INT_MIN, INT_MAX, DEC, "pattern_type" }, { "sequence", "select sequence pattern type", 0, AV_OPT_TYPE_CONST, {.i64=PT_SEQUENCE }, INT_MIN, INT_MAX, DEC, "pattern_type" }, |