X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffserver.c;h=8b6e44151362aec6b6e323312d76dbb883e087c2;hb=94a4be85a1fcd57fdfd45dc291813d6afef8a87b;hp=c74cd157aa01764b1906db61797dd7177637b19f;hpb=d06ea6e5ce51165c7c81677ab6827612173bf4f7;p=ffmpeg diff --git a/ffserver.c b/ffserver.c index c74cd157aa0..8b6e4415136 100644 --- a/ffserver.c +++ b/ffserver.c @@ -1936,7 +1936,7 @@ static void compute_status(HTTPContext *c) avio_printf(pb, "

Feed %s

", stream->filename); if (stream->pid) { - avio_printf(pb, "Running as pid %d.\n", stream->pid); + avio_printf(pb, "Running as pid %"PRId64".\n", (int64_t) stream->pid); #if defined(linux) { @@ -1945,8 +1945,8 @@ static void compute_status(HTTPContext *c) /* This is somewhat linux specific I guess */ snprintf(ps_cmd, sizeof(ps_cmd), - "ps -o \"%%cpu,cputime\" --no-headers %d", - stream->pid); + "ps -o \"%%cpu,cputime\" --no-headers %"PRId64"", + (int64_t) stream->pid); pid_stat = popen(ps_cmd, "r"); if (pid_stat) { @@ -3510,7 +3510,7 @@ static void extract_mpeg4_header(AVFormatContext *infile) if (p[0] == 0x00 && p[1] == 0x00 && p[2] == 0x01 && p[3] == 0xb6) { size = p - pkt.data; - st->codec->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE); + st->codec->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); st->codec->extradata_size = size; memcpy(st->codec->extradata, pkt.data, size); break; @@ -3778,8 +3778,8 @@ static void handle_child_exit(int sig) uptime = time(0) - feed->pid_start; feed->pid = 0; fprintf(stderr, - "%s: Pid %d exited with status %d after %d seconds\n", - feed->filename, pid, status, uptime); + "%s: Pid %"PRId64" exited with status %d after %d seconds\n", + feed->filename, (int64_t) pid, status, uptime); if (uptime < 30) /* Turn off any more restarts */