diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-31 17:15:42 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-31 17:20:01 +0400 |
| commit | 08196c785a1df33da435c5a669c9c560f647290c (patch) | |
| tree | 2f1e51c4f37f40cbcdff0c9858f0ae2acf5649ef /libavfilter/vf_frei0r.c | |
| parent | 98275283d52622c16a6d59f508de7d40216e8b63 (diff) | |
| parent | 506409776c49910050f3150d0e51d11b44d323ed (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: suppress -fPIC in msvc builds
Drop unnecessary 'l' length modifier when printfing double values.
truemotion2: Sanitize tm2_read_header()
Conflicts:
libavcodec/truemotion2.c
libavfilter/src_movie.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_frei0r.c')
| -rw-r--r-- | libavfilter/vf_frei0r.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index 0fb86b4267..7ed78fa1d7 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -189,7 +189,7 @@ static int set_params(AVFilterContext *ctx, const char *params) case F0R_PARAM_POSITION: v = &pos; frei0r->get_param_value(frei0r->instance, v, i); - av_log(ctx, AV_LOG_DEBUG, "%lf/%lf", pos.x, pos.y); + av_log(ctx, AV_LOG_DEBUG, "%f/%f", pos.x, pos.y); break; default: /* F0R_PARAM_STRING */ v = s; |