From 8cfb9ccfef5fb0b827999a5a356a9e1cf4505bb0 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 9 Oct 2014 05:46:13 +0200 Subject: [PATCH] avcodec/utils: Fix "warning: pointer type mismatch in conditional expression" Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 50fcf6fa4c..3bab3ea3a7 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2951,7 +2951,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) int bitrate; int new_line = 0; AVRational display_aspect_ratio; - const char *separator = enc->dump_separator ? enc->dump_separator : ", "; + const char *separator = enc->dump_separator ? (const char *)enc->dump_separator : ", "; if (!buf || buf_size <= 0) return;