diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-09 05:46:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-09 05:46:13 +0200 |
| commit | 8cfb9ccfef5fb0b827999a5a356a9e1cf4505bb0 (patch) | |
| tree | 294fb25896541a4283d7b9b54da89c8f28f46ba2 /libavcodec/utils.c | |
| parent | 0578623039040141ceccdabf2c8d91a46d2dd0f1 (diff) | |
| download | ffmpeg-8cfb9ccfef5fb0b827999a5a356a9e1cf4505bb0.tar.gz | |
avcodec/utils: Fix "warning: pointer type mismatch in conditional expression"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |