summaryrefslogtreecommitdiff
path: root/ffmpeg/libavformat/mpl2dec.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/mpl2dec.c
parentb7a5a477b8ff4d4e3028b9dfb9a9df0a41463f92 (diff)
basic type mechanism working
Diffstat (limited to 'ffmpeg/libavformat/mpl2dec.c')
-rw-r--r--ffmpeg/libavformat/mpl2dec.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ffmpeg/libavformat/mpl2dec.c b/ffmpeg/libavformat/mpl2dec.c
index ce2061b..17b302d 100644
--- a/ffmpeg/libavformat/mpl2dec.c
+++ b/ffmpeg/libavformat/mpl2dec.c
@@ -40,10 +40,10 @@ static int mpl2_probe(AVProbeData *p)
const unsigned char *ptr_end = ptr + p->buf_size;
for (i = 0; i < 2; i++) {
- if (sscanf(ptr, "[%"PRId64"][%"PRId64"]%c", &start, &end, &c) != 3 &&
- sscanf(ptr, "[%"PRId64"][]%c", &start, &c) != 2)
+ if (sscanf(ptr, "[%"SCNd64"][%"SCNd64"]%c", &start, &end, &c) != 3 &&
+ sscanf(ptr, "[%"SCNd64"][]%c", &start, &c) != 2)
return 0;
- ptr += strcspn(ptr, "\r\n") + 1;
+ ptr += ff_subtitles_next_line(ptr);
if (ptr >= ptr_end)
return 0;
}
@@ -56,13 +56,13 @@ static int read_ts(char **line, int64_t *pts_start, int *duration)
int len;
int64_t end;
- if (sscanf(*line, "[%"PRId64"][]%c%n",
+ if (sscanf(*line, "[%"SCNd64"][]%c%n",
pts_start, &c, &len) >= 2) {
*duration = -1;
*line += len - 1;
return 0;
}
- if (sscanf(*line, "[%"PRId64"][%"PRId64"]%c%n",
+ if (sscanf(*line, "[%"SCNd64"][%"SCNd64"]%c%n",
pts_start, &end, &c, &len) >= 3) {
*duration = end - *pts_start;
*line += len - 1;