ffmpeg | branch: release/2.4 | Alexander Strasser <[email protected]> | Sun Oct 5 03:42:32 2014 +0200| [d61454e7c1de48f6a9059ca98f55e6beb52a618c] | committer: Michael Niedermayer
avformat/img2dec: Attempt to detect non-escaped glob patterns too (-pattern_type glob) Fixes ticket #3948 Based-on-patch-by: Michael Niedermayer <[email protected]> Signed-off-by: Alexander Strasser <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit e079d43af86c38a0c0efb9bc6058e1316e6a18f4) Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d61454e7c1de48f6a9059ca98f55e6beb52a618c --- libavformat/img2dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index ee484f6..2969b51 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -162,6 +162,8 @@ static int img_read_probe(AVProbeData *p) return AVPROBE_SCORE_MAX; else if (is_glob(p->filename)) return AVPROBE_SCORE_MAX; + else if (p->filename[strcspn(p->filename, "*?{")]) // probably PT_GLOB + return AVPROBE_SCORE_EXTENSION + 2; // score chosen to be a tad above the image pipes else if (p->buf_size == 0) return 0; else if (av_match_ext(p->filename, "raw") || av_match_ext(p->filename, "gif")) _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
