Merge commit '1e56173515826aa4d680d3b216d80a3879ed1c68'

[ffmpeg] / libavformat / vivo.c

diff --git a/libavformat/vivo.c b/libavformat/vivo.c
index c9e9c37f37dfbede0a94504c8fe025cc5c135984..9a07c43849f1288bca560df753a113e8f2f155fc 100644 (file)
--- a/libavformat/vivo.c
+++ b/libavformat/vivo.c
@@ -40,7 +40,7 @@ typedef struct VivoContext {
     uint8_t  text[1024 + 1];
 } VivoContext;
 
-static int vivo_probe(AVProbeData *p)
+static int vivo_probe(const AVProbeData *p)
 {
     const unsigned char *buf = p->buf;
     unsigned c, length = 0;
@@ -166,7 +166,7 @@ static int vivo_read_header(AVFormatContext *s)
             value = strchr(key, ':');
             if (!value) {
                 av_log(s, AV_LOG_WARNING, "missing colon in key:value pair '%s'\n",
-                       value);
+                       key);
                 continue;
             }