summaryrefslogtreecommitdiff
path: root/ffmpeg/libavformat/mpsubdec.c
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2013-12-29 12:19:38 +0000
committerTim Redfern <tim@eclectronics.org>2013-12-29 12:19:38 +0000
commitf7813a5324be39d13ab536c245d15dfc602a7849 (patch)
treefad99148b88823d34a5df2f0a25881a002eb291b /ffmpeg/libavformat/mpsubdec.c
parentb7a5a477b8ff4d4e3028b9dfb9a9df0a41463f92 (diff)
basic type mechanism working
Diffstat (limited to 'ffmpeg/libavformat/mpsubdec.c')
-rw-r--r--ffmpeg/libavformat/mpsubdec.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/ffmpeg/libavformat/mpsubdec.c b/ffmpeg/libavformat/mpsubdec.c
index 2acafaa..c5bdcdb 100644
--- a/ffmpeg/libavformat/mpsubdec.c
+++ b/ffmpeg/libavformat/mpsubdec.c
@@ -37,12 +37,16 @@ static int mpsub_probe(AVProbeData *p)
const char *ptr_end = p->buf + p->buf_size;
while (ptr < ptr_end) {
- int n;
-
- if (!memcmp(ptr, "FORMAT=TIME", 11) ||
- sscanf(ptr, "FORMAT=%d", &n) == 1)
- return AVPROBE_SCORE_MAX/2;
- ptr += strcspn(ptr, "\n") + 1;
+ int inc;
+
+ if (!memcmp(ptr, "FORMAT=TIME", 11))
+ return AVPROBE_SCORE_EXTENSION;
+ if (!memcmp(ptr, "FORMAT=", 7))
+ return AVPROBE_SCORE_EXTENSION / 3;
+ inc = ff_subtitles_next_line(ptr);
+ if (!inc)
+ break;
+ ptr += inc;
}
return 0;
}