# HG changeset patch # User michael # Date 1126480797 0 # Node ID 8026edf6a349f8aac02c436dad8fdee0cab25b42 # Parent 1021498a515932442f996e8d2859f65cb4008bee avoid stdio.h diff -r 1021498a5159 -r 8026edf6a349 opt.c --- a/opt.c Sun Sep 11 14:39:33 2005 +0000 +++ b/opt.c Sun Sep 11 23:19:57 2005 +0000 @@ -24,7 +24,6 @@ * @author Michael Niedermayer */ -#include //for FILE * #include "avcodec.h" static double av_parse_num(const char *name, char **tail){ @@ -224,26 +223,26 @@ return num*intnum/den; } -int av_opt_show(void *obj, FILE *f){ +int av_opt_show(void *obj, void *av_log_obj){ AVOption *opt=NULL; if(!obj) return -1; -#undef fprintf - fprintf(f, "%s AVOptions:\n", (*(AVClass**)obj)->class_name); + + av_log(av_log_obj, AV_LOG_INFO, "%s AVOptions:\n", (*(AVClass**)obj)->class_name); while((opt= av_next_option(obj, opt))){ if(!(opt->flags & (AV_OPT_FLAG_ENCODING_PARAM|AV_OPT_FLAG_DECODING_PARAM))) continue; - fprintf(f, "-%-17s ", opt->name); - fprintf(f, "%c", (opt->flags & AV_OPT_FLAG_ENCODING_PARAM) ? 'E' : '.'); - fprintf(f, "%c", (opt->flags & AV_OPT_FLAG_DECODING_PARAM) ? 'D' : '.'); - fprintf(f, "%c", (opt->flags & AV_OPT_FLAG_VIDEO_PARAM ) ? 'V' : '.'); - fprintf(f, "%c", (opt->flags & AV_OPT_FLAG_AUDIO_PARAM ) ? 'A' : '.'); - fprintf(f, "%c", (opt->flags & AV_OPT_FLAG_SUBTITLE_PARAM) ? 'S' : '.'); + av_log(av_log_obj, AV_LOG_INFO, "-%-17s ", opt->name); + av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_ENCODING_PARAM) ? 'E' : '.'); + av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_DECODING_PARAM) ? 'D' : '.'); + av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_VIDEO_PARAM ) ? 'V' : '.'); + av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_AUDIO_PARAM ) ? 'A' : '.'); + av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_SUBTITLE_PARAM) ? 'S' : '.'); - fprintf(f, " %s\n", opt->help); + av_log(av_log_obj, AV_LOG_INFO, " %s\n", opt->help); } return 0; } diff -r 1021498a5159 -r 8026edf6a349 opt.h --- a/opt.h Sun Sep 11 14:39:33 2005 +0000 +++ b/opt.h Sun Sep 11 23:19:57 2005 +0000 @@ -56,6 +56,6 @@ int64_t av_get_int(void *obj, const char *name, AVOption **o_out); const char *av_get_string(void *obj, const char *name, AVOption **o_out, char *buf, int buf_len); AVOption *av_next_option(void *obj, AVOption *last); -int av_opt_show(void *obj, FILE *f); +int av_opt_show(void *obj, void *av_log_obj); #endif