Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavfilter / vf_mp.c

diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c
index 6541f6d3f96f180780c1781224276e3d934f9311..8cc93f7d859d868317eb4ae89bd2820c79215bc8 100644 (file)
--- a/libavfilter/vf_mp.c
+++ b/libavfilter/vf_mp.c
@@ -711,11 +711,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
     char name[256];
     int i;
 
-    av_log(ctx, AV_LOG_WARNING,
-"This is a unholy filter, it will be purified by the ffmpeg exorcist team\n"
-"which will change its syntax from dark -vf mp to light -vf.\n"
-"Thou shalst not make spells or scripts that depend on it\n");
-
     m->avfctx= ctx;
 
     if(!args || 1!=sscanf(args, "%255[^:=]", name)){
@@ -734,6 +729,10 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
         return AVERROR(EINVAL);
     }
 
+    av_log(ctx, AV_LOG_WARNING,
+           "'%s' is a wrapped MPlayer filter (libmpcodecs). This filter may be removed\n"
+           "once it has been ported to a native libavfilter.\n", name);
+
     memset(&m->vf,0,sizeof(m->vf));
     m->vf.info= filters[i];
 
@@ -879,7 +878,7 @@ static void end_frame(AVFilterLink *inlink)
 
 AVFilter avfilter_vf_mp = {
     .name      = "mp",
-    .description = NULL_IF_CONFIG_SMALL("libmpcodecs wrapper."),
+    .description = NULL_IF_CONFIG_SMALL("Apply a libmpcodecs filter to the input video."),
     .init = init,
     .priv_size = sizeof(MPContext),
     .query_formats = query_formats,