[FFmpeg-cvslog] avutil/opt: fix types passed to the format string "%s"

Michael Niedermayer git at videolan.org
Thu Aug 8 02:49:29 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  8 02:39:24 2013 +0200| [0b5d1b88e09be795a5e7c07a89d84ab47d466457] | committer: Michael Niedermayer

avutil/opt: fix types passed to the format string "%s"

Fixes gcc warnings
Fixes CID1061056
Fixes CID1061057

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

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

 libavutil/opt.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 87ac570..5a67992 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -962,10 +962,10 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit,
                 av_log(av_log_obj, AV_LOG_INFO, "%d/%d", q.num, q.den); }
                 break;
             case AV_OPT_TYPE_PIXEL_FMT:
-                av_log(av_log_obj, AV_LOG_INFO, "%s", av_x_if_null(av_get_pix_fmt_name(opt->default_val.i64), "none"));
+                av_log(av_log_obj, AV_LOG_INFO, "%s", (char *)av_x_if_null(av_get_pix_fmt_name(opt->default_val.i64), "none"));
                 break;
             case AV_OPT_TYPE_SAMPLE_FMT:
-                av_log(av_log_obj, AV_LOG_INFO, "%s", av_x_if_null(av_get_sample_fmt_name(opt->default_val.i64), "none"));
+                av_log(av_log_obj, AV_LOG_INFO, "%s", (char *)av_x_if_null(av_get_sample_fmt_name(opt->default_val.i64), "none"));
                 break;
             case AV_OPT_TYPE_COLOR:
             case AV_OPT_TYPE_IMAGE_SIZE:



More information about the ffmpeg-cvslog mailing list