[FFmpeg-cvslog] avformat: revert %c changes from d92024f18fa3d69937cb2575f3a8bf973df02430

Michael Niedermayer git at videolan.org
Wed Mar 12 05:18:14 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 05:05:01 2014 +0100| [1f36ebf63a8d6ffccf4bf286849d77f76aad8b8f] | committer: Michael Niedermayer

avformat: revert %c changes from d92024f18fa3d69937cb2575f3a8bf973df02430

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f36ebf63a8d6ffccf4bf286849d77f76aad8b8f
---

 libavformat/cafdec.c |    2 +-
 libavformat/mov.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index 04aa4dc..a8edbca 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -288,7 +288,7 @@ static int read_header(AVFormatContext *s)
         default:
 #define _(x) ((x) >= ' ' ? (x) : ' ')
             av_log(s, AV_LOG_WARNING,
-                   "skipping CAF chunk: %08"PRIX32" (%"PRIu8"%"PRIu8"%"PRIu8"%"PRIu8"), size %"PRId64"\n",
+                   "skipping CAF chunk: %08"PRIX32" (%c%c%c%c), size %"PRId64"\n",
                 tag, _(tag>>24), _((tag>>16)&0xFF), _((tag>>8)&0xFF), _(tag&0xFF), size);
 #undef _
         case MKBETAG('f','r','e','e'):
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7570234..8220b5a 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1650,7 +1650,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
 
         id = mov_codec_id(st, format);
 
-        av_dlog(c->fc, "size=%"PRId64" 4CC= %"PRIu8"%"PRIu8"%"PRIu8"%"PRIu8" codec_type=%d\n", size,
+        av_dlog(c->fc, "size=%"PRId64" 4CC= %c%c%c%c codec_type=%d\n", size,
                 (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff,
                 (format >> 24) & 0xff, st->codec->codec_type);
 



More information about the ffmpeg-cvslog mailing list