diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-27 01:58:09 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-27 01:58:09 +0200 |
commit | b536e2facfa0872adeb6aaae4189f9b90d907e36 (patch) | |
tree | 3649d9dd83aa7e0ed617ce3de4a1b7020ef89251 /libavfilter/vf_frei0r.c | |
parent | 5916bc46581230c68c946c0b4733cce381eddcbd (diff) | |
parent | c29c1a1b6bade2b9118c7fa01239c622c2238656 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: add an assert to silence an uninitialized variable warning.
avconv: shut up an uninitialized variable warning.
avfiltergraph: shut up uninitialized variable warning.
af_join: initialize a variable to shut up gcc warning.
amix: fix format specifier for AVFilterLink.sample_rate.
lavfi: make filters less verbose.
mpc8: read APE tags.
lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes
libm: provide fallback definition for cbrtf() using powf()
network: Don't redefine error codes if they already exist in errno.h
configure: Check for sys/time.h
network: Include unistd.h from network.h
avconv: don't include vsrc_buffer.h, which doesn't exist anymore
lavfi: reorder AVFilterLink fields.
lavfi: reorder AVFilterContext fields.
lavfi: reorder AVFilter fields.
lavfi: reorder AVFilterBufferRef fields.
lavfi: reorder AVFilterBuffer fields.
Conflicts:
configure
libavcodec/v210dec.h
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.h
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_aspect.c
libavfilter/vf_crop.c
libavfilter/vf_drawbox.c
libavfilter/vf_fade.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vsrc_color.c
libavformat/network.h
libavutil/libm.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_frei0r.c')
-rw-r--r-- | libavfilter/vf_frei0r.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index a5501270fa..99594551f8 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -146,7 +146,7 @@ static int set_params(AVFilterContext *ctx, const char *params) return ret; } - av_log(ctx, AV_LOG_INFO, + av_log(ctx, AV_LOG_VERBOSE, "idx:%d name:'%s' type:%s explanation:'%s' ", i, info.name, info.type == F0R_PARAM_BOOL ? "bool" : @@ -157,7 +157,7 @@ static int set_params(AVFilterContext *ctx, const char *params) info.explanation); #ifdef DEBUG - av_log(ctx, AV_LOG_INFO, "value:"); + av_log(ctx, AV_LOG_DEBUG, "value:"); switch (info.type) { void *v; double d; @@ -168,31 +168,31 @@ static int set_params(AVFilterContext *ctx, const char *params) case F0R_PARAM_BOOL: v = &d; frei0r->get_param_value(frei0r->instance, v, i); - av_log(ctx, AV_LOG_INFO, "%s", d >= 0.5 && d <= 1.0 ? "y" : "n"); + av_log(ctx, AV_LOG_DEBUG, "%s", d >= 0.5 && d <= 1.0 ? "y" : "n"); break; case F0R_PARAM_DOUBLE: v = &d; frei0r->get_param_value(frei0r->instance, v, i); - av_log(ctx, AV_LOG_INFO, "%f", d); + av_log(ctx, AV_LOG_DEBUG, "%f", d); break; case F0R_PARAM_COLOR: v = &col; frei0r->get_param_value(frei0r->instance, v, i); - av_log(ctx, AV_LOG_INFO, "%f/%f/%f", col.r, col.g, col.b); + av_log(ctx, AV_LOG_DEBUG, "%f/%f/%f", col.r, col.g, col.b); break; case F0R_PARAM_POSITION: v = &pos; frei0r->get_param_value(frei0r->instance, v, i); - av_log(ctx, AV_LOG_INFO, "%lf/%lf", pos.x, pos.y); + av_log(ctx, AV_LOG_DEBUG, "%lf/%lf", pos.x, pos.y); break; default: /* F0R_PARAM_STRING */ v = s; frei0r->get_param_value(frei0r->instance, v, i); - av_log(ctx, AV_LOG_INFO, "'%s'\n", s); + av_log(ctx, AV_LOG_DEBUG, "'%s'\n", s); break; } #endif - av_log(ctx, AV_LOG_INFO, "\n"); + av_log(ctx, AV_LOG_VERBOSE, "\n"); } return 0; @@ -266,7 +266,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx, return AVERROR(EINVAL); } - av_log(ctx, AV_LOG_INFO, + av_log(ctx, AV_LOG_VERBOSE, "name:%s author:'%s' explanation:'%s' color_model:%s " "frei0r_version:%d version:%d.%d num_params:%d\n", pi->name, pi->author, pi->explanation, |