1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

Merge commit '4438c256387a5845e5cdc5c14c43f4047b68301b'

* commit '4438c256387a5845e5cdc5c14c43f4047b68301b':
  vf_interlace: remove the warning tag in the message

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-07 00:03:02 +01:00
commit f2f88b952d

View File

@ -100,7 +100,7 @@ static int config_out_props(AVFilterLink *outlink)
} }
if (!s->lowpass) if (!s->lowpass)
av_log(ctx, AV_LOG_WARNING, "***warning*** Lowpass filter is disabled, " av_log(ctx, AV_LOG_WARNING, "Lowpass filter is disabled, "
"the resulting video will be aliased rather than interlaced.\n"); "the resulting video will be aliased rather than interlaced.\n");
// same input size // same input size