Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changed format string - %td not supported by our MingW environment.
- Loading branch information
CrystalP
authored and
CrystalP
committed
Oct 15, 2011
1 parent
15239de
commit 69279f6
Showing
2 changed files
with
26 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
lib/ffmpeg/patches/0056-Changed-format-string-td-not-supported-by-our-MingW-.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
From a584fbd0039270ae30ce08603ef6e819c61c908a Mon Sep 17 00:00:00 2001 | ||
From: CrystalP <CrystalP@xbmc.org> | ||
Date: Thu, 6 Oct 2011 13:25:28 -0400 | ||
Subject: [PATCH 6/6] Changed format string - %td not supported by our MingW environment. | ||
|
||
--- | ||
lib/ffmpeg/libavcodec/h264.c | 2 +- | ||
1 files changed, 1 insertions(+), 1 deletions(-) | ||
|
||
diff --git a/lib/ffmpeg/libavcodec/h264.c b/lib/ffmpeg/libavcodec/h264.c | ||
index a4d35ae..31d43df 100644 | ||
--- a/lib/ffmpeg/libavcodec/h264.c | ||
+++ b/lib/ffmpeg/libavcodec/h264.c | ||
@@ -2568,7 +2568,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg){ | ||
return 0; | ||
} | ||
if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 2) { | ||
- av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d, bytestream (%td)\n", s->mb_x, s->mb_y, h->cabac.bytestream_end - h->cabac.bytestream); | ||
+ av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d, bytestream (%u)\n", s->mb_x, s->mb_y, h->cabac.bytestream_end - h->cabac.bytestream); | ||
ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask); | ||
return -1; | ||
} | ||
-- | ||
1.7.3.1.msysgit.0 | ||
|