[SCM] libav/experimental: Fix "unrecognized WC3 chunk" debug output which was broken r18444 due to sign expansion.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:43:51 UTC 2013
The following commit has been merged in the experimental branch:
commit 7ce0420983f63508d5ccc524d253e4a1637b4c8a
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date: Sat Apr 11 21:45:57 2009 +0000
Fix "unrecognized WC3 chunk" debug output which was broken r18444 due to sign expansion.
Originally committed as revision 18450 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c
index 42f50d4..b96d3e1 100644
--- a/libavformat/wc3movie.c
+++ b/libavformat/wc3movie.c
@@ -224,8 +224,8 @@ static int wc3_read_header(AVFormatContext *s,
default:
av_log(s, AV_LOG_ERROR, " unrecognized WC3 chunk: %c%c%c%c (0x%02X%02X%02X%02X)\n",
- (char)fourcc_tag, (char)(fourcc_tag >> 8), (char)(fourcc_tag >> 16), (char)(fourcc_tag >> 24),
- (char)fourcc_tag, (char)(fourcc_tag >> 8), (char)(fourcc_tag >> 16), (char)(fourcc_tag >> 24));
+ (uint8_t)fourcc_tag, (uint8_t)(fourcc_tag >> 8), (uint8_t)(fourcc_tag >> 16), (uint8_t)(fourcc_tag >> 24),
+ (uint8_t)fourcc_tag, (uint8_t)(fourcc_tag >> 8), (uint8_t)(fourcc_tag >> 16), (uint8_t)(fourcc_tag >> 24));
return AVERROR_INVALIDDATA;
break;
}
@@ -356,8 +356,8 @@ static int wc3_read_packet(AVFormatContext *s,
default:
av_log (s, AV_LOG_ERROR, " unrecognized WC3 chunk: %c%c%c%c (0x%02X%02X%02X%02X)\n",
- (char)fourcc_tag, (char)(fourcc_tag >> 8), (char)(fourcc_tag >> 16), (char)(fourcc_tag >> 24),
- (char)fourcc_tag, (char)(fourcc_tag >> 8), (char)(fourcc_tag >> 16), (char)(fourcc_tag >> 24));
+ (uint8_t)fourcc_tag, (uint8_t)(fourcc_tag >> 8), (uint8_t)(fourcc_tag >> 16), (uint8_t)(fourcc_tag >> 24),
+ (uint8_t)fourcc_tag, (uint8_t)(fourcc_tag >> 8), (uint8_t)(fourcc_tag >> 16), (uint8_t)(fourcc_tag >> 24));
ret = AVERROR_INVALIDDATA;
packet_read = 1;
break;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list