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_overlay.c | |
| parent | 5916bc46581230c68c946c0b4733cce381eddcbd (diff) | |
| parent | c29c1a1b6bade2b9118c7fa01239c622c2238656 (diff) | |
| download | ffmpeg-b536e2facfa0872adeb6aaae4189f9b90d907e36.tar.gz | |
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_overlay.c')
| -rw-r--r-- | libavfilter/vf_overlay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index dc4e00d785..a3a9cc275c 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -245,7 +245,7 @@ static int config_input_overlay(AVFilterLink *inlink) ff_fill_rgba_map(over->overlay_rgba_map, inlink->format) >= 0; over->overlay_has_alpha = ff_fmt_is_in(inlink->format, alpha_pix_fmts); - av_log(ctx, AV_LOG_INFO, + av_log(ctx, AV_LOG_VERBOSE, "main w:%d h:%d fmt:%s overlay x:%d y:%d w:%d h:%d fmt:%s\n", ctx->inputs[MAIN]->w, ctx->inputs[MAIN]->h, av_pix_fmt_descriptors[ctx->inputs[MAIN]->format].name, @@ -284,7 +284,7 @@ static int config_output(AVFilterLink *outlink) av_gcd((int64_t)tb1.num * tb2.den, (int64_t)tb2.num * tb1.den), (int64_t)tb1.den * tb2.den, INT_MAX); - av_log(ctx, AV_LOG_INFO, + av_log(ctx, AV_LOG_VERBOSE, "main_tb:%d/%d overlay_tb:%d/%d -> tb:%d/%d exact:%d\n", tb1.num, tb1.den, tb2.num, tb2.den, tb->num, tb->den, exact); if (!exact) |