[FFmpeg-cvslog] avcodec/utils: Fix "warning: pointer type mismatch in conditional expression"

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct  9 05:46:13 2014 +0200| [8cfb9ccfef5fb0b827999a5a356a9e1cf4505bb0] | committer: Michael Niedermayer

avcodec/utils: Fix "warning: pointer type mismatch in conditional expression"

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

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

 libavcodec/utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 50fcf6f..3bab3ea 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;