Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

quiet compiler warnings for string formatting in ffmpeg logging

Browse Source
This commit is contained in:
Campbell Barton
2011-10-12 22:00:53 +00:00
parent c6f253f8a6
commit cfebab7715
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/imbuf/intern/anim_movie.c
View File

@@ -749,9 +749,9 @@ static int ffmpeg_decode_video_frame(struct anim * anim)
" FRAME DONE: " " FRAME DONE: "
"next_pts=%lld pkt_pts=%lld\n", "next_pts=%lld pkt_pts=%lld\n",
(anim->pFrame->pts == AV_NOPTS_VALUE) ? (anim->pFrame->pts == AV_NOPTS_VALUE) ?
-1 : anim->pFrame->pts, -1 : (long long int)anim->pFrame->pts,
(anim->pFrame->pkt_pts == AV_NOPTS_VALUE) ? (anim->pFrame->pkt_pts == AV_NOPTS_VALUE) ?
-1 : anim->pFrame->pkt_pts); -1 : (long long int)anim->pFrame->pkt_pts);
anim->next_pts = anim->next_pts =
av_get_pts_from_frame(anim->pFormatCtx, av_get_pts_from_frame(anim->pFormatCtx,
anim->pFrame); anim->pFrame);
@@ -771,9 +771,9 @@ static int ffmpeg_decode_video_frame(struct anim * anim)
anim->next_packet.stream_index, anim->next_packet.stream_index,
anim->videoStream, anim->videoStream,
(anim->next_packet.dts == AV_NOPTS_VALUE) ? -1: (anim->next_packet.dts == AV_NOPTS_VALUE) ? -1:
anim->next_packet.dts, (long long int)anim->next_packet.dts,
(anim->next_packet.pts == AV_NOPTS_VALUE) ? -1: (anim->next_packet.pts == AV_NOPTS_VALUE) ? -1:
anim->next_packet.pts, (long long int)anim->next_packet.pts,
(anim->next_packet.flags & AV_PKT_FLAG_KEY) ? (anim->next_packet.flags & AV_PKT_FLAG_KEY) ?
" KEY" : ""); " KEY" : "");
if (anim->next_packet.stream_index == anim->videoStream) { if (anim->next_packet.stream_index == anim->videoStream) {
@@ -800,11 +800,11 @@ static int ffmpeg_decode_video_frame(struct anim * anim)
" FRAME DONE: next_pts=%lld " " FRAME DONE: next_pts=%lld "
"pkt_pts=%lld, guessed_pts=%lld\n", "pkt_pts=%lld, guessed_pts=%lld\n",
(anim->pFrame->pts == AV_NOPTS_VALUE) ? (anim->pFrame->pts == AV_NOPTS_VALUE) ?
-1 : anim->pFrame->pts, -1 : (long long int)anim->pFrame->pts,
(anim->pFrame->pkt_pts (anim->pFrame->pkt_pts
== AV_NOPTS_VALUE) ? == AV_NOPTS_VALUE) ?
-1 : anim->pFrame->pkt_pts, -1 : (long long int)anim->pFrame->pkt_pts,
anim->next_pts); (long long int)anim->next_pts);
} }
} }
av_free_packet(&anim->next_packet); av_free_packet(&anim->next_packet);
@@ -828,13 +828,13 @@ static void ffmpeg_decode_video_frame_scan(
av_log(anim->pFormatCtx, av_log(anim->pFormatCtx,
AV_LOG_DEBUG, AV_LOG_DEBUG,
"SCAN start: considering pts=%lld in search of %lld\n", "SCAN start: considering pts=%lld in search of %lld\n",
anim->next_pts, pts_to_search); (long long int)anim->next_pts, (long long int)pts_to_search);
while (count > 0 && anim->next_pts < pts_to_search) { while (count > 0 && anim->next_pts < pts_to_search) {
av_log(anim->pFormatCtx, av_log(anim->pFormatCtx,
AV_LOG_DEBUG, AV_LOG_DEBUG,
" WHILE: pts=%lld in search of %lld\n", " WHILE: pts=%lld in search of %lld\n",
anim->next_pts, pts_to_search); (long long int)anim->next_pts, (long long int)pts_to_search);
if (!ffmpeg_decode_video_frame(anim)) { if (!ffmpeg_decode_video_frame(anim)) {
break; break;
} }
@@ -845,7 +845,7 @@ static void ffmpeg_decode_video_frame_scan(
AV_LOG_ERROR, AV_LOG_ERROR,
"SCAN failed: completely lost in stream, " "SCAN failed: completely lost in stream, "
"bailing out at PTS=%lld, searching for PTS=%lld\n", "bailing out at PTS=%lld, searching for PTS=%lld\n",
anim->next_pts, pts_to_search); (long long int)anim->next_pts, (long long int)pts_to_search);
} }
if (anim->next_pts == pts_to_search) { if (anim->next_pts == pts_to_search) {
av_log(anim->pFormatCtx, av_log(anim->pFormatCtx,
@@ -942,13 +942,13 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position,
av_log(anim->pFormatCtx, AV_LOG_DEBUG, av_log(anim->pFormatCtx, AV_LOG_DEBUG,
"FETCH: looking for PTS=%lld " "FETCH: looking for PTS=%lld "
"(pts_timebase=%g, frame_rate=%g, st_time=%lld)\n", "(pts_timebase=%g, frame_rate=%g, st_time=%lld)\n",
pts_to_search, pts_time_base, frame_rate, st_time); (long long int)pts_to_search, pts_time_base, frame_rate, st_time);
if (anim->last_frame && if (anim->last_frame &&
anim->last_pts <= pts_to_search && anim->next_pts > pts_to_search){ anim->last_pts <= pts_to_search && anim->next_pts > pts_to_search){
av_log(anim->pFormatCtx, AV_LOG_DEBUG, av_log(anim->pFormatCtx, AV_LOG_DEBUG,
"FETCH: frame repeat: last: %lld next: %lld\n", "FETCH: frame repeat: last: %lld next: %lld\n",
anim->last_pts, anim->next_pts); (long long int)anim->last_pts, (long long int)anim->next_pts);
IMB_refImBuf(anim->last_frame); IMB_refImBuf(anim->last_frame);
anim->curposition = position; anim->curposition = position;
return anim->last_frame; return anim->last_frame;
@@ -961,7 +961,8 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position,
av_log(anim->pFormatCtx, AV_LOG_DEBUG, av_log(anim->pFormatCtx, AV_LOG_DEBUG,
"FETCH: no seek necessary: " "FETCH: no seek necessary: "
"next: %lld next undecoded: %lld\n", "next: %lld next undecoded: %lld\n",
anim->next_pts, anim->next_undecoded_pts); (long long int)anim->next_pts,
(long long int)anim->next_undecoded_pts);
/* we are already done :) */ /* we are already done :) */
@@ -1035,7 +1036,7 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position,
"FETCH: " "FETCH: "
"error while seeking to DTS = %lld " "error while seeking to DTS = %lld "
"(frameno = %d, PTS = %lld): errcode = %d\n", "(frameno = %d, PTS = %lld): errcode = %d\n",
pos, position, pts_to_search, ret); pos, position, (long long int)pts_to_search, ret);
} }
avcodec_flush_buffers(anim->pCodecCtx); avcodec_flush_buffers(anim->pCodecCtx);