virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

Replace all occurrences of PRI in sscanf() calls with SCN

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2013-04-10 04:52:08 -03:00
committed by Clément Bœsch
parent 2383068cbf
commit 89388a953a
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/aqtitledec.c
View File

@@ -70,7 +70,7 @@ static int aqt_read_header(AVFormatContext *s)
line[strcspn(line, "\r\n")] = 0;
if (sscanf(line, "-->> %"PRId64, &frame) == 1) {
if (sscanf(line, "-->> %"SCNd64, &frame) == 1) {
new_event = 1;
pos = avio_tell(s->pb);
if (sub) {

2
libavformat/mpeg.c
View File

@@ -735,7 +735,7 @@ static int vobsub_read_header(AVFormatContext *s)
int64_t pos, timestamp;
const char *p = line + 10;
if (sscanf(p, "%02d:%02d:%02d:%03d, filepos: %"PRIx64,
if (sscanf(p, "%02d:%02d:%02d:%03d, filepos: %"SCNx64,
&hh, &mm, &ss, &ms, &pos) != 5) {
av_log(s, AV_LOG_ERROR, "Unable to parse timestamp line '%s', "
"abort parsing\n", line);

8
libavformat/mpl2dec.c
View File

@@ -40,8 +40,8 @@ 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;
if (ptr >= ptr_end)
@@ -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;

4
libavformat/pjsdec.c
View File

@@ -39,7 +39,7 @@ static int pjs_probe(AVProbeData *p)
int64_t start, end;
const unsigned char *ptr = p->buf;
if (sscanf(ptr, "%"PRId64",%"PRId64",%c", &start, &end, &c) == 3) {
if (sscanf(ptr, "%"SCNd64",%"SCNd64",%c", &start, &end, &c) == 3) {
size_t q1pos = strcspn(ptr, "\"");
size_t q2pos = q1pos + strcspn(ptr + q1pos + 1, "\"") + 1;
if (strcspn(ptr, "\r\n") > q2pos)
@@ -52,7 +52,7 @@ static int64_t read_ts(char **line, int *duration)
{
int64_t start, end;
if (sscanf(*line, "%"PRId64",%"PRId64, &start, &end) == 2) {
if (sscanf(*line, "%"SCNd64",%"SCNd64, &start, &end) == 2) {
*line += strcspn(*line, "\"") + 1;
*duration = end - start;
return start;

2
libavformat/rpl.c
View File

@@ -255,7 +255,7 @@ static int rpl_read_header(AVFormatContext *s)
for (i = 0; !error && i < number_of_chunks; i++) {
int64_t offset, video_size, audio_size;
error |= read_line(pb, line, sizeof(line));
if (3 != sscanf(line, "%"PRId64" , %"PRId64" ; %"PRId64,
if (3 != sscanf(line, "%"SCNd64" , %"SCNd64" ; %"SCNd64,
&offset, &video_size, &audio_size))
error = -1;
av_add_index_entry(vst, offset, i * rpl->frames_per_chunk,

2
libswscale/swscale-test.c
View File

@@ -305,7 +305,7 @@ static int fileTest(uint8_t *ref[4], int refStride[4], int w, int h, FILE *fp,
ret = sscanf(buf,
" %12s %dx%d -> %12s %dx%d flags=%d CRC=%x"
" SSD=%"PRId64 ", %"PRId64 ", %"PRId64 ", %"PRId64 "\n",
" SSD=%"SCNd64 ", %"SCNd64 ", %"SCNd64 ", %"SCNd64 "\n",
srcStr, &srcW, &srcH, dstStr, &dstW, &dstH,
&flags, &r.crc, &r.ssdY, &r.ssdU, &r.ssdV, &r.ssdA);
if (ret != 12) {

2
tools/seek_print.c
View File

@@ -91,7 +91,7 @@ int main(int argc, char **argv)
av_ts2str(packet.pts), av_ts2timestr(packet.pts, tb));
av_free_packet(&packet);
}
} else if (sscanf(*argv, "seek:%i:%"PRIi64":%"PRIi64":%"PRIi64":%i",
} else if (sscanf(*argv, "seek:%i:%"SCNi64":%"SCNi64":%"SCNi64":%i",
&stream, &min_ts, &ts, &max_ts, &flags) == 5) {
ret = avformat_seek_file(avf, stream, min_ts, ts, max_ts, flags);
printf("seek: %d (%s)\n", ret, av_err2str(ret));