aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-07 00:03:02 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-07 00:03:10 +0100
commitf2f88b952d666587fa6292bb219a82d0bee2229f (patch)
tree39dad89f6e93dd8340272d0bdffcfcd2cd3de35b /libavfilter
parent82b1bcd7f9b650a9d46a22079c0cdac05badeebc (diff)
parent4438c256387a5845e5cdc5c14c43f4047b68301b (diff)
downloadffmpeg-f2f88b952d666587fa6292bb219a82d0bee2229f.tar.gz
Merge commit '4438c256387a5845e5cdc5c14c43f4047b68301b'
* commit '4438c256387a5845e5cdc5c14c43f4047b68301b': vf_interlace: remove the warning tag in the message Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/vf_interlace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_interlace.c b/libavfilter/vf_interlace.c
index a61909409e..93a83aa31a 100644
--- a/libavfilter/vf_interlace.c
+++ b/libavfilter/vf_interlace.c
@@ -100,7 +100,7 @@ static int config_out_props(AVFilterLink *outlink)
}
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");
// same input size