From 44f566b79afcbbb152ec21db667ea3d2f42e8f8d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 22 Apr 2011 19:30:25 +0200 Subject: [PATCH] Make av_log_ask_for_sample() accept a variable number of arguments. --- libavcodec/avcodec.h | 2 +- libavcodec/utils.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index d1377ca0f8..14f00bb5d0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4116,7 +4116,7 @@ void av_log_missing_feature(void *avc, const char *feature, int want_sample); * a pointer to an AVClass struct * @param[in] msg string containing an optional message, or NULL if no message */ -void av_log_ask_for_sample(void *avc, const char *msg); +void av_log_ask_for_sample(void *avc, const char *msg, ...); /** * Register the hardware accelerator hwaccel. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 744e0ada87..d60e236952 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1133,13 +1133,19 @@ void av_log_missing_feature(void *avc, const char *feature, int want_sample) av_log(avc, AV_LOG_WARNING, "\n"); } -void av_log_ask_for_sample(void *avc, const char *msg) +void av_log_ask_for_sample(void *avc, const char *msg, ...) { + va_list argument_list; + + va_start(argument_list, msg); + if (msg) - av_log(avc, AV_LOG_WARNING, "%s ", msg); + av_vlog(avc, AV_LOG_WARNING, msg, argument_list); av_log(avc, AV_LOG_WARNING, "If you want to help, upload a sample " "of this file to ftp://upload.libav.org/incoming/ " "and contact the libav-devel mailing list.\n"); + + va_end(argument_list); } static AVHWAccel *first_hwaccel = NULL;