Merge commit 'bbf71d46db3417b43bcbd745cbf235e8e2ff69ae'

[ffmpeg] / libavformat / format.c

diff --git a/libavformat/format.c b/libavformat/format.c
index fd81d7a132a9e61a2019864c9baa80032576e288..ffddb13782798301b65657a1cc210cd4ef2b0690 100644 (file)
--- a/libavformat/format.c
+++ b/libavformat/format.c
@@ -175,7 +175,7 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened,
     const static uint8_t zerobuffer[AVPROBE_PADDING_SIZE];
 
     if (!lpd.buf)
-        lpd.buf = zerobuffer;
+        lpd.buf = (unsigned char *) zerobuffer;
 
     if (lpd.buf_size > 10 && ff_id3v2_match(lpd.buf, ID3v2_DEFAULT_MAGIC)) {
         int id3len = ff_id3v2_tag_len(lpd.buf);