From ccd3228e54cc01baaf019a4b3842e378340cbdc9 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Sat, 14 Oct 2006 20:43:39 +0000 Subject: [PATCH] =?utf8?q?Use=20proper=20PRI=3F64=20macros=20for=20%ll=3F?= =?utf8?q?=20format=20to=20fix=20printf=20format=20warnings:=20utils.c:833?= =?utf8?q?:=20warning:=20format=20=E2=80=98%lld=E2=80=99=20expects=20type?= =?utf8?q?=20=E2=80=98long=20long=20int=E2=80=99,=20but=20argument=205=20h?= =?utf8?q?as=20type=20=E2=80=98int64=5Ft=E2=80=99=20utils.c:833:=20warning?= =?utf8?q?:=20format=20=E2=80=98%lld=E2=80=99=20expects=20type=20=E2=80=98?= =?utf8?q?long=20long=20int=E2=80=99,=20but=20argument=206=20has=20type=20?= =?utf8?q?=E2=80=98int64=5Ft=E2=80=99=20utils.c:854:=20warning:=20format?= =?utf8?q?=20=E2=80=98%lld=E2=80=99=20expects=20type=20=E2=80=98long=20lon?= =?utf8?q?g=20int=E2=80=99,=20but=20argument=205=20has=20type=20=E2=80=98i?= =?utf8?q?nt64=5Ft=E2=80=99=20utils.c:854:=20warning:=20format=20=E2=80=98?= =?utf8?q?%lld=E2=80=99=20expects=20type=20=E2=80=98long=20long=20int?= =?utf8?q?=E2=80=99,=20but=20argument=206=20has=20type=20=E2=80=98int64=5F?= =?utf8?q?t=E2=80=99=20asf.c:872:=20warning:=20format=20=E2=80=98%Lx?= =?utf8?q?=E2=80=99=20expects=20type=20=E2=80=98long=20long=20unsigned=20i?= =?utf8?q?nt=E2=80=99,=20but=20argument=204=20has=20type=20=E2=80=98int64?= =?utf8?q?=5Ft=E2=80=99=20mov.c:1754:=20warning:=20format=20=E2=80=98%llx?= =?utf8?q?=E2=80=99=20expects=20type=20=E2=80=98long=20long=20unsigned=20i?= =?utf8?q?nt=E2=80=99,=20but=20argument=205=20has=20type=20=E2=80=98int64?= =?utf8?q?=5Ft=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Approved by Michael. Originally committed as revision 6692 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/asf.c | 4 ++-- libavformat/mov.c | 2 +- libavformat/utils.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/asf.c b/libavformat/asf.c index 69c5e19..33ae66c 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -869,7 +869,7 @@ static void asf_build_simple_index(AVFormatContext *s, int stream_index) itime=get_le64(&s->pb); pct=get_le32(&s->pb); ict=get_le32(&s->pb); - av_log(NULL, AV_LOG_DEBUG, "itime:0x%Lx, pct:%d, ict:%d\n",itime,pct,ict); + av_log(NULL, AV_LOG_DEBUG, "itime:0x%"PRIx64", pct:%d, ict:%d\n",itime,pct,ict); for (i=0;ipb); @@ -933,7 +933,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int // } /* do the seek */ - av_log(NULL, AV_LOG_DEBUG, "SEEKTO: %Ld\n", pos); + av_log(NULL, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos); url_fseek(&s->pb, pos, SEEK_SET); } asf_reset_header(s); diff --git a/libavformat/mov.c b/libavformat/mov.c index 7cbfbbc..09d8cd7 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1751,7 +1751,7 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) /* must be done just before reading, to avoid infinite loop on sample */ sc->current_sample++; if (sample->pos >= url_fsize(&s->pb)) { - av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%llx: partial file\n", sc->ffindex, sample->pos); + av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n", sc->ffindex, sample->pos); return -1; } #ifdef CONFIG_DV_DEMUXER diff --git a/libavformat/utils.c b/libavformat/utils.c index 29b09cf..efe0755 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -826,7 +826,7 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt) st = s->streams[s->cur_pkt.stream_index]; if(st->codec->debug & FF_DEBUG_PTS) - av_log(s, AV_LOG_DEBUG, "av_read_packet stream=%d, pts=%lld, dts=%lld, size=%d\n", + av_log(s, AV_LOG_DEBUG, "av_read_packet stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d\n", s->cur_pkt.stream_index, s->cur_pkt.pts, s->cur_pkt.dts, @@ -847,7 +847,7 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt) } } if(st->codec->debug & FF_DEBUG_PTS) - av_log(s, AV_LOG_DEBUG, "av_read_frame_internal stream=%d, pts=%lld, dts=%lld, size=%d\n", + av_log(s, AV_LOG_DEBUG, "av_read_frame_internal stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d\n", pkt->stream_index, pkt->pts, pkt->dts, -- 2.7.4